14 files changed, 33 insertions, 32 deletions
diff --git a/src/imports/controls/controls.pro b/src/imports/controls/controls.pro
index 0fc73673..c6f9d7f0 100644
--- a/src/imports/controls/controls.pro
+++ b/src/imports/controls/controls.pro
@@ -1,9 +1,9 @@
-TARGET = qtlabscontrolsplugin
+TARGET = qtquickcontrolsplugin
 TARGETPATH = Qt/labs/controls
 IMPORT_VERSION = 1.0
 
 QT += qml quick
-QT_PRIVATE += core-private gui-private qml-private quick-private labstemplates-private labscontrols-private
+QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates-private quickcontrols-private
 
 DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
 
@@ -17,12 +17,12 @@ HEADERS += \
     $$PWD/qquickprogressstrip_p.h
 
 SOURCES += \
-    $$PWD/qtlabscontrolsplugin.cpp \
+    $$PWD/qtquickcontrolsplugin.cpp \
     $$PWD/qquickbusyindicatorring.cpp \
     $$PWD/qquickprogressstrip.cpp
 
 RESOURCES += \
-    $$PWD/qtlabscontrolsplugin.qrc
+    $$PWD/qtquickcontrolsplugin.qrc
 
 include(controls.pri)
 !static: include(designer/designer.pri)
diff --git a/src/imports/controls/material/material.pro b/src/imports/controls/material/material.pro
index 63450289..2f62a195 100644
--- a/src/imports/controls/material/material.pro
+++ b/src/imports/controls/material/material.pro
@@ -3,7 +3,7 @@ TARGETPATH = Qt/labs/controls/material
 IMPORT_VERSION = 1.0
 
 QT += qml quick
-QT_PRIVATE += core-private gui-private qml-private quick-private labstemplates-private labscontrols-private
+QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates-private quickcontrols-private
 
 DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
 
diff --git a/src/imports/controls/material/qquickmaterialstyle.cpp b/src/imports/controls/material/qquickmaterialstyle.cpp
index 4788001f..e73aaef5 100644
--- a/src/imports/controls/material/qquickmaterialstyle.cpp
+++ b/src/imports/controls/material/qquickmaterialstyle.cpp
@@ -39,7 +39,7 @@
 #include <QtCore/qdebug.h>
 #include <QtCore/qsettings.h>
 #include <QtQml/qqmlinfo.h>
-#include <QtLabsControls/private/qquickstyleattached_p.h>
+#include <QtQuickControls/private/qquickstyleattached_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/imports/controls/material/qquickmaterialstyle_p.h b/src/imports/controls/material/qquickmaterialstyle_p.h
index 2bf2915e..aa8aa9f4 100644
--- a/src/imports/controls/material/qquickmaterialstyle_p.h
+++ b/src/imports/controls/material/qquickmaterialstyle_p.h
@@ -49,7 +49,7 @@
 //
 
 #include <QtGui/qcolor.h>
-#include <QtLabsControls/private/qquickstyleattached_p.h>
+#include <QtQuickControls/private/qquickstyleattached_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/imports/controls/material/qquickmaterialtheme_p.h b/src/imports/controls/material/qquickmaterialtheme_p.h
index af899c6f..9fd74bcc 100644
--- a/src/imports/controls/material/qquickmaterialtheme_p.h
+++ b/src/imports/controls/material/qquickmaterialtheme_p.h
@@ -50,7 +50,7 @@
 
 #include <QtGui/qpa/qplatformtheme.h>
 #include <QtGui/qfont.h>
-#include <QtLabsControls/private/qquickproxytheme_p.h>
+#include <QtQuickControls/private/qquickproxytheme_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/imports/controls/material/qtlabsmaterialstyleplugin.cpp b/src/imports/controls/material/qtlabsmaterialstyleplugin.cpp
index 95e09225..a42424ea 100644
--- a/src/imports/controls/material/qtlabsmaterialstyleplugin.cpp
+++ b/src/imports/controls/material/qtlabsmaterialstyleplugin.cpp
@@ -42,7 +42,8 @@
 #include "qquickmaterialprogressstrip_p.h"
 
 #include <QtGui/private/qguiapplication_p.h>
-#include <QtLabsControls/qquickstyle.h>
+#include <QtQuickControls/qquickstyle.h>
+#include <QtQuickControls/private/qquickstyleselector_p.h>
 
 static inline void initResources()
 {
diff --git a/src/imports/controls/qmldir b/src/imports/controls/qmldir
index 98c57fe1..3250e255 100644
--- a/src/imports/controls/qmldir
+++ b/src/imports/controls/qmldir
@@ -1,5 +1,5 @@
 module Qt.labs.controls
-plugin qtlabscontrolsplugin
-classname QtLabsControlsPlugin
+plugin qtquickcontrolsplugin
+classname QtQuickControlsPlugin
 depends Qt.labs.templates 1.0
 designersupported
diff --git a/src/imports/controls/qtlabscontrolsplugin.cpp b/src/imports/controls/qtquickcontrolsplugin.cpp
index 9196f685..10b57347 100644
--- a/src/imports/controls/qtlabscontrolsplugin.cpp
+++ b/src/imports/controls/qtquickcontrolsplugin.cpp
@@ -40,44 +40,44 @@
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/private/qfileselector_p.h>
 
-#include <QtLabsControls/qquickstyle.h>
-#include <QtLabsTemplates/private/qquickabstractbutton_p.h>
-#include <QtLabsTemplates/private/qquickbuttongroup_p.h>
-#include <QtLabsTemplates/private/qquickcontainer_p.h>
-#include <QtLabsTemplates/private/qquickcontrol_p.h>
-#include <QtLabsTemplates/private/qquickpopup_p.h>
-#include <QtLabsControls/private/qquickstyleselector_p.h>
+#include <QtQuickControls/qquickstyle.h>
+#include <QtQuickTemplates/private/qquickabstractbutton_p.h>
+#include <QtQuickTemplates/private/qquickbuttongroup_p.h>
+#include <QtQuickTemplates/private/qquickcontainer_p.h>
+#include <QtQuickTemplates/private/qquickcontrol_p.h>
+#include <QtQuickTemplates/private/qquickpopup_p.h>
+#include <QtQuickControls/private/qquickstyleselector_p.h>
 
 #include "qquickbusyindicatorring_p.h"
 #include "qquickprogressstrip_p.h"
 
 static inline void initResources()
 {
-    Q_INIT_RESOURCE(qtlabscontrolsplugin);
+    Q_INIT_RESOURCE(qtquickcontrolsplugin);
 #ifdef QT_STATIC
-    Q_INIT_RESOURCE(qmake_Qt_labs_controls);
+    Q_INIT_RESOURCE(qmake_Qt_quick_controls);
 #endif
 }
 
 QT_BEGIN_NAMESPACE
 
-class QtLabsControlsPlugin: public QQmlExtensionPlugin
+class QtQuickControlsPlugin: public QQmlExtensionPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
 
 public:
-    QtLabsControlsPlugin(QObject *parent = nullptr);
+    QtQuickControlsPlugin(QObject *parent = nullptr);
     void registerTypes(const char *uri);
     void initializeEngine(QQmlEngine *engine, const char *uri);
 };
 
-QtLabsControlsPlugin::QtLabsControlsPlugin(QObject *parent) : QQmlExtensionPlugin(parent)
+QtQuickControlsPlugin::QtQuickControlsPlugin(QObject *parent) : QQmlExtensionPlugin(parent)
 {
     initResources();
 }
 
-void QtLabsControlsPlugin::registerTypes(const char *uri)
+void QtQuickControlsPlugin::registerTypes(const char *uri)
 {
     qmlRegisterType<QQuickAbstractButton>(uri, 1, 0, "AbstractButton");
     qmlRegisterType<QQuickButtonGroup>(uri, 1, 0, "ButtonGroup");
@@ -132,7 +132,7 @@ void QtLabsControlsPlugin::registerTypes(const char *uri)
     qmlRegisterType(selector.select(QStringLiteral("Tumbler.qml")), uri, 1, 0, "Tumbler");
 }
 
-void QtLabsControlsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
+void QtQuickControlsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
 {
     Q_UNUSED(engine);
     Q_UNUSED(uri);
@@ -146,4 +146,4 @@ void QtLabsControlsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
 
 QT_END_NAMESPACE
 
-#include "qtlabscontrolsplugin.moc"
+#include "qtquickcontrolsplugin.moc"
diff --git a/src/imports/controls/qtlabscontrolsplugin.qrc b/src/imports/controls/qtquickcontrolsplugin.qrc
index 1147ae3d..1147ae3d 100644
--- a/src/imports/controls/qtlabscontrolsplugin.qrc
+++ b/src/imports/controls/qtquickcontrolsplugin.qrc
diff --git a/src/imports/controls/universal/qquickuniversalstyle.cpp b/src/imports/controls/universal/qquickuniversalstyle.cpp
index ee678609..fb948dec 100644
--- a/src/imports/controls/universal/qquickuniversalstyle.cpp
+++ b/src/imports/controls/universal/qquickuniversalstyle.cpp
@@ -39,7 +39,7 @@
 #include <QtCore/qdebug.h>
 #include <QtCore/qsettings.h>
 #include <QtQml/qqmlinfo.h>
-#include <QtLabsControls/private/qquickstyleattached_p.h>
+#include <QtQuickControls/private/qquickstyleattached_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/imports/controls/universal/qquickuniversalstyle_p.h b/src/imports/controls/universal/qquickuniversalstyle_p.h
index 47a6de4a..b0787389 100644
--- a/src/imports/controls/universal/qquickuniversalstyle_p.h
+++ b/src/imports/controls/universal/qquickuniversalstyle_p.h
@@ -49,7 +49,7 @@
 //
 
 #include <QtGui/qcolor.h>
-#include <QtLabsControls/private/qquickstyleattached_p.h>
+#include <QtQuickControls/private/qquickstyleattached_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/imports/controls/universal/qquickuniversaltheme_p.h b/src/imports/controls/universal/qquickuniversaltheme_p.h
index 809d7a89..07e4905d 100644
--- a/src/imports/controls/universal/qquickuniversaltheme_p.h
+++ b/src/imports/controls/universal/qquickuniversaltheme_p.h
@@ -50,7 +50,7 @@
 
 #include <QtGui/qpa/qplatformtheme.h>
 #include <QtGui/qfont.h>
-#include <QtLabsControls/private/qquickproxytheme_p.h>
+#include <QtQuickControls/private/qquickproxytheme_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp b/src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp
index b3bb421e..15857f67 100644
--- a/src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp
+++ b/src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp
@@ -42,8 +42,8 @@
 #include "qquickuniversaltheme_p.h"
 
 #include <QtGui/private/qguiapplication_p.h>
-#include <QtLabsControls/private/qquickcolorimageprovider_p.h>
-#include <QtLabsControls/qquickstyle.h>
+#include <QtQuickControls/private/qquickcolorimageprovider_p.h>
+#include <QtQuickControls/qquickstyle.h>
 
 static inline void initResources()
 {
diff --git a/src/imports/controls/universal/universal.pro b/src/imports/controls/universal/universal.pro
index 88bad8f7..76d3d89e 100644
--- a/src/imports/controls/universal/universal.pro
+++ b/src/imports/controls/universal/universal.pro
@@ -3,7 +3,7 @@ TARGETPATH = Qt/labs/controls/universal
 IMPORT_VERSION = 1.0
 
 QT += qml quick
-QT_PRIVATE += core-private gui-private qml-private quick-private labstemplates-private labscontrols-private
+QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates-private quickcontrols-private
 
 DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII