diff options
Diffstat (limited to 'src/controls/Styles/Android/qquickandroidstyle.cpp')
| -rw-r--r-- | src/controls/Styles/Android/qquickandroidstyle.cpp | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/src/controls/Styles/Android/qquickandroidstyle.cpp b/src/controls/Styles/Android/qquickandroidstyle.cpp index 4f4f9478..0c57d795 100644 --- a/src/controls/Styles/Android/qquickandroidstyle.cpp +++ b/src/controls/Styles/Android/qquickandroidstyle.cpp @@ -1,34 +1,37 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Quick Controls module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL$ ** 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 The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/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 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** Foundation and appearing in the file LICENSE.LGPL3 included in the ** packaging of this file. Please review the following information to ** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. ** ** GNU General Public License Usage ** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** @@ -70,26 +73,26 @@ static QString resolvePath() return stylePath; } -QQuickAndroidStyle::QQuickAndroidStyle(QObject *parent) : QObject(parent) +QQuickAndroidStyle1::QQuickAndroidStyle1(QObject *parent) : QObject(parent) { m_path = resolvePath(); } -QByteArray QQuickAndroidStyle::data() const +QByteArray QQuickAndroidStyle1::data() const { if (m_data.isNull() && !m_path.isNull()) m_data = readFile(m_path + QLatin1String("style.json")); return m_data; } -QString QQuickAndroidStyle::filePath(const QString &fileName) const +QString QQuickAndroidStyle1::filePath(const QString &fileName) const { if (!fileName.isEmpty()) return m_path + QFileInfo(fileName).fileName(); return QString(); } -QColor QQuickAndroidStyle::colorValue(uint value) const +QColor QQuickAndroidStyle1::colorValue(uint value) const { return QColor::fromRgba(value); } |