diff options
Diffstat (limited to 'src/controls/Private/qquickcontrolsprivate.cpp')
| -rw-r--r-- | src/controls/Private/qquickcontrolsprivate.cpp | 45 |
1 files changed, 24 insertions, 21 deletions
diff --git a/src/controls/Private/qquickcontrolsprivate.cpp b/src/controls/Private/qquickcontrolsprivate.cpp index 61282668..6dd5fa2f 100644 --- a/src/controls/Private/qquickcontrolsprivate.cpp +++ b/src/controls/Private/qquickcontrolsprivate.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$ ** @@ -40,34 +43,34 @@ QT_BEGIN_NAMESPACE -QQuickControlsPrivateAttached::QQuickControlsPrivateAttached(QObject *attachee) +QQuickControlsPrivate1Attached::QQuickControlsPrivate1Attached(QObject *attachee) : m_attachee(qobject_cast<QQuickItem*>(attachee)) { if (m_attachee) - connect(m_attachee, &QQuickItem::windowChanged, this, &QQuickControlsPrivateAttached::windowChanged); + connect(m_attachee, &QQuickItem::windowChanged, this, &QQuickControlsPrivate1Attached::windowChanged); } -QQuickWindow *QQuickControlsPrivateAttached::window() const +QQuickWindow *QQuickControlsPrivate1Attached::window() const { return m_attachee ? m_attachee->window() : 0; } -QObject *QQuickControlsPrivate::registerTooltipModule(QQmlEngine *engine, QJSEngine *jsEngine) +QObject *QQuickControlsPrivate1::registerTooltipModule(QQmlEngine *engine, QJSEngine *jsEngine) { Q_UNUSED(engine); Q_UNUSED(jsEngine); - return new QQuickTooltip(); + return new QQuickTooltip1(); } -QObject *QQuickControlsPrivate::registerSettingsModule(QQmlEngine *engine, QJSEngine *jsEngine) +QObject *QQuickControlsPrivate1::registerSettingsModule(QQmlEngine *engine, QJSEngine *jsEngine) { Q_UNUSED(jsEngine); - return new QQuickControlSettings(engine); + return new QQuickControlSettings1(engine); } -QQuickControlsPrivateAttached *QQuickControlsPrivate::qmlAttachedProperties(QObject *object) +QQuickControlsPrivate1Attached *QQuickControlsPrivate1::qmlAttachedProperties(QObject *object) { - return new QQuickControlsPrivateAttached(object); + return new QQuickControlsPrivate1Attached(object); } QT_END_NAMESPACE |