diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-19 18:03:14 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-19 18:03:14 +0200 |
| commit | 77703754d73b9309683c83ca4460e599eb8f28e2 (patch) | |
| tree | f5da2114b88a929dd58a36437c9181adc2783063 /src/controls/Styles/Android/qquickandroid9patch.cpp | |
| parent | faa5f59e2f26a5c4cf8b681443f2209d1b516b9c (diff) | |
| parent | c3b5a796820d792c5c36e472b917e5a47b28763b (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/controls/Styles/iOS/ComboBoxStyle.qml
src/controls/Styles/iOS/SpinBoxStyle.qml
src/controls/Styles/iOS/TextAreaStyle.qml
src/controls/Styles/iOS/TextFieldStyle.qml
src/controls/Styles/iOS/iOS.pro
Change-Id: Ib31ead16807a952a39aaa611b27ad89d4f86c60c
Diffstat (limited to 'src/controls/Styles/Android/qquickandroid9patch.cpp')
| -rw-r--r-- | src/controls/Styles/Android/qquickandroid9patch.cpp | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/src/controls/Styles/Android/qquickandroid9patch.cpp b/src/controls/Styles/Android/qquickandroid9patch.cpp index 031abeafa..57e0e019d 100644 --- a/src/controls/Styles/Android/qquickandroid9patch.cpp +++ b/src/controls/Styles/Android/qquickandroid9patch.cpp @@ -5,36 +5,28 @@ ** ** This file is part of the Qt Quick Controls module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL$ +** $QT_BEGIN_LICENSE:LGPL21$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information ** use the contact form at http://qt.digia.com/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** General Public License version 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** ** $QT_END_LICENSE$ ** ****************************************************************************/ |