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/private/plugin.cpp | |
| 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/private/plugin.cpp')
| -rw-r--r-- | src/private/plugin.cpp | 19 |
1 files changed, 3 insertions, 16 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 |