diff options
| author | Caroline Chao <caroline.chao@digia.com> | 2013-06-20 13:14:47 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-24 08:00:05 +0200 |
| commit | c9606ede4ab6656306f7dbd08cf59919e5c63f23 (patch) | |
| tree | 689867dd296822a7c502831f492b410687ed1c92 /src | |
| parent | 591e2faf5eb4eb1a817d00d3e74ecc00a38767cc (diff) | |
Move the static register functions into QQuickControlsPrivate
And create a separate header file, qquickcontrolsprivate_p.h
Change-Id: Ibb4ec834709b6240fb19379a67e3948426d0f4ec
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/private/plugin.cpp | 19 | ||||
| -rw-r--r-- | src/private/private.pro | 3 | ||||
| -rw-r--r-- | src/private/qquickcontrolsprivate_p.h | 71 |
3 files changed, 76 insertions, 17 deletions
diff --git a/src/private/plugin.cpp b/src/private/plugin.cpp index e33c2d375..b35c4f3ce 100644 --- a/src/private/plugin.cpp +++ b/src/private/plugin.cpp @@ -46,6 +46,7 @@ #include "qquickcontrolsettings_p.h" #include "qquickspinboxvalidator_p.h" #include "qquickabstractstyle_p.h" +#include "qquickcontrolsprivate_p.h" #ifndef QT_NO_WIDGETS #include "qquickstyleitem_p.h" @@ -56,20 +57,6 @@ QT_BEGIN_NAMESPACE -static QObject *registerTooltipModule(QQmlEngine *engine, QJSEngine *jsEngine) -{ - Q_UNUSED(engine); - Q_UNUSED(jsEngine); - return new QQuickTooltip(); -} - -static QObject *registerSettingsModule(QQmlEngine *engine, QJSEngine *jsEngine) -{ - Q_UNUSED(engine); - Q_UNUSED(jsEngine); - return new QQuickControlSettings(engine); -} - class QtQuickControlsPrivatePlugin : public QQmlExtensionPlugin { Q_OBJECT @@ -86,8 +73,8 @@ void QtQuickControlsPrivatePlugin::registerTypes(const char *uri) qmlRegisterType<QQuickRangeModel>(uri, 1, 0, "RangeModel"); qmlRegisterType<QQuickWheelArea>(uri, 1, 0, "WheelArea"); qmlRegisterType<QQuickSpinBoxValidator>(uri, 1, 0, "SpinBoxValidator"); - qmlRegisterSingletonType<QQuickTooltip>(uri, 1, 0, "Tooltip", registerTooltipModule); - qmlRegisterSingletonType<QQuickControlSettings>(uri, 1, 0, "Settings", registerSettingsModule); + qmlRegisterSingletonType<QQuickTooltip>(uri, 1, 0, "Tooltip", QQuickControlsPrivate::registerTooltipModule); + qmlRegisterSingletonType<QQuickControlSettings>(uri, 1, 0, "Settings", QQuickControlsPrivate::registerSettingsModule); #ifndef QT_NO_WIDGETS qmlRegisterType<QQuickStyleItem>(uri, 1, 0, "StyleItem"); #endif diff --git a/src/private/private.pro b/src/private/private.pro index 803b703f4..fb9b29d35 100644 --- a/src/private/private.pro +++ b/src/private/private.pro @@ -11,7 +11,8 @@ HEADERS += \ $$PWD/qquickcontrolsettings_p.h \ $$PWD/qquickwheelarea_p.h \ $$PWD/qquickabstractstyle_p.h \ - $$PWD/qquickpadding_p.h + $$PWD/qquickpadding_p.h \ + $$PWD/qquickcontrolsprivate_p.h SOURCES += \ $$PWD/plugin.cpp \ diff --git a/src/private/qquickcontrolsprivate_p.h b/src/private/qquickcontrolsprivate_p.h new file mode 100644 index 000000000..068b2a217 --- /dev/null +++ b/src/private/qquickcontrolsprivate_p.h @@ -0,0 +1,71 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** +** $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 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. +** +** In addition, as a special exception, Digia gives you certain additional +** 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$ +** +****************************************************************************/ + +#ifndef QQUICKCONTROLSPRIVATE_P_H +#define QQUICKCONTROLSPRIVATE_P_H + +#include "qqml.h" + +QT_BEGIN_NAMESPACE + +class QQuickControlsPrivate { + +public: + + inline static QObject *registerTooltipModule(QQmlEngine *engine, QJSEngine *jsEngine) + { + Q_UNUSED(engine); + Q_UNUSED(jsEngine); + return new QQuickTooltip(); + } + + inline static QObject *registerSettingsModule(QQmlEngine *engine, QJSEngine *jsEngine) + { + Q_UNUSED(engine); + Q_UNUSED(jsEngine); + return new QQuickControlSettings(engine); + } + +}; + +QT_END_NAMESPACE + +#endif // QQUICKCONTROLSPRIVATE_P_H |