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