Rename Qt Labs Controls to Qt Quick Controls 2 - build system

The imports will be done later, as we don't want to change them until
the module is releasable (which requires things like selection handles,
etc.).

Change-Id: I2140cff7058fc3b696e92ca8c0e5e06dca9a7c9c
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>

10 files changed, 30 insertions, 30 deletions

diff --git a/src/controls/controls.pro b/src/controls/controls.pro
index 953ca1ae..16f2005c 100644
--- a/src/controls/controls.pro
+++ b/src/controls/controls.pro
@@ -1,14 +1,14 @@
-TARGET = QtLabsControls
-MODULE = labscontrols
+TARGET = QtQuickControls
+MODULE = quickcontrols
 
 QT += quick
-QT_PRIVATE += core-private gui-private qml-private quick-private labstemplates-private
+QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates-private
 
 DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
 
 HEADERS += \
-    $$PWD/qtlabscontrolsglobal.h
-    $$PWD/qtlabscontrolsglobal_p.h
+    $$PWD/qtquickcontrolsglobal.h
+    $$PWD/qtquickcontrolsglobal_p.h
 
 include(controls.pri)
 load(qt_module)
diff --git a/src/controls/qquickcolorimageprovider_p.h b/src/controls/qquickcolorimageprovider_p.h
index f50668f8..475449d5 100644
--- a/src/controls/qquickcolorimageprovider_p.h
+++ b/src/controls/qquickcolorimageprovider_p.h
@@ -49,11 +49,11 @@
 //
 
 #include <QtQuick/qquickimageprovider.h>
-#include <QtLabsControls/private/qtlabscontrolsglobal_p.h>
+#include <QtQuickControls/private/qtquickcontrolsglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_LABSCONTROLS_PRIVATE_EXPORT QQuickColorImageProvider : public QQuickImageProvider
+class Q_QUICKCONTROLS_PRIVATE_EXPORT QQuickColorImageProvider : public QQuickImageProvider
 {
 public:
     QQuickColorImageProvider(const QString &path);
diff --git a/src/controls/qquickpaddedrectangle_p.h b/src/controls/qquickpaddedrectangle_p.h
index 22cd54f4..b8c8dc4a 100644
--- a/src/controls/qquickpaddedrectangle_p.h
+++ b/src/controls/qquickpaddedrectangle_p.h
@@ -49,11 +49,11 @@
 //
 
 #include <QtQuick/private/qquickrectangle_p.h>
-#include <QtLabsControls/private/qtlabscontrolsglobal_p.h>
+#include <QtQuickControls/private/qtquickcontrolsglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_LABSCONTROLS_PRIVATE_EXPORT QQuickPaddedRectangle : public QQuickRectangle
+class Q_QUICKCONTROLS_PRIVATE_EXPORT QQuickPaddedRectangle : public QQuickRectangle
 {
     Q_OBJECT
     Q_PROPERTY(qreal padding READ padding WRITE setPadding RESET resetPadding NOTIFY paddingChanged FINAL)
diff --git a/src/controls/qquickproxytheme_p.h b/src/controls/qquickproxytheme_p.h
index f20201ac..5f4b42b5 100644
--- a/src/controls/qquickproxytheme_p.h
+++ b/src/controls/qquickproxytheme_p.h
@@ -49,11 +49,11 @@
 //
 
 #include <QtGui/qpa/qplatformtheme.h>
-#include <QtLabsControls/private/qtlabscontrolsglobal_p.h>
+#include <QtQuickControls/private/qtquickcontrolsglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_LABSCONTROLS_PRIVATE_EXPORT QQuickProxyTheme :  public QPlatformTheme
+class Q_QUICKCONTROLS_PRIVATE_EXPORT QQuickProxyTheme :  public QPlatformTheme
 {
 public:
     QQuickProxyTheme(QPlatformTheme *theme);
diff --git a/src/controls/qquickstyle.h b/src/controls/qquickstyle.h
index 062b7fbb..6946a214 100644
--- a/src/controls/qquickstyle.h
+++ b/src/controls/qquickstyle.h
@@ -39,11 +39,11 @@
 
 #include <QtCore/qurl.h>
 #include <QtCore/qstring.h>
-#include <QtLabsControls/qtlabscontrolsglobal.h>
+#include <QtQuickControls/qtquickcontrolsglobal.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_LABSCONTROLS_EXPORT QQuickStyle
+class Q_QUICKCONTROLS_EXPORT QQuickStyle
 {
 public:
     static QString name();
diff --git a/src/controls/qquickstyleattached.cpp b/src/controls/qquickstyleattached.cpp
index 91ad6b10..7b93a0a5 100644
--- a/src/controls/qquickstyleattached.cpp
+++ b/src/controls/qquickstyleattached.cpp
@@ -40,7 +40,7 @@
 #include <QtCore/qsettings.h>
 #include <QtCore/qfileselector.h>
 #include <QtQuick/private/qquickitem_p.h>
-#include <QtLabsTemplates/private/qquickpopup_p.h>
+#include <QtQuickTemplates/private/qquickpopup_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/controls/qquickstyleattached_p.h b/src/controls/qquickstyleattached_p.h
index 61e04bf6..7835a482 100644
--- a/src/controls/qquickstyleattached_p.h
+++ b/src/controls/qquickstyleattached_p.h
@@ -54,13 +54,13 @@
 #include <QtCore/qpointer.h>
 #include <QtCore/qsharedpointer.h>
 #include <QtQuick/private/qquickitemchangelistener_p.h>
-#include <QtLabsControls/private/qtlabscontrolsglobal_p.h>
+#include <QtQuickControls/private/qtquickcontrolsglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QSettings;
 
-class Q_LABSCONTROLS_PRIVATE_EXPORT QQuickStyleAttached : public QObject, public QQuickItemChangeListener
+class Q_QUICKCONTROLS_PRIVATE_EXPORT QQuickStyleAttached : public QObject, public QQuickItemChangeListener
 {
     Q_OBJECT
 
diff --git a/src/controls/qquickstyleselector_p.h b/src/controls/qquickstyleselector_p.h
index 56a3b386..86e550e7 100644
--- a/src/controls/qquickstyleselector_p.h
+++ b/src/controls/qquickstyleselector_p.h
@@ -48,13 +48,13 @@
 
 #include <QtCore/qurl.h>
 #include <QtCore/qscopedpointer.h>
-#include <QtLabsControls/private/qtlabscontrolsglobal_p.h>
+#include <QtQuickControls/private/qtquickcontrolsglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickStyleSelectorPrivate;
 
-class Q_LABSCONTROLS_PRIVATE_EXPORT QQuickStyleSelector
+class Q_QUICKCONTROLS_PRIVATE_EXPORT QQuickStyleSelector
 {
 public:
     explicit QQuickStyleSelector();
diff --git a/src/controls/qtlabscontrolsglobal.h b/src/controls/qtquickcontrolsglobal.h
index 08cef64a..98926da4 100644
--- a/src/controls/qtlabscontrolsglobal.h
+++ b/src/controls/qtquickcontrolsglobal.h
@@ -34,23 +34,23 @@
 **
 ****************************************************************************/
 
-#ifndef QTLABSCONTROLSSGLOBAL_H
-#define QTLABSCONTROLSSGLOBAL_H
+#ifndef QTQUICKCONTROLSGLOBAL_H
+#define QTQUICKCONTROLSGLOBAL_H
 
 #include <QtCore/qglobal.h>
 
 QT_BEGIN_NAMESPACE
 
 #ifndef QT_STATIC
-#  if defined(QT_BUILD_LABSCONTROLS_LIB)
-#    define Q_LABSCONTROLS_EXPORT Q_DECL_EXPORT
+#  if defined(QT_BUILD_QUICKCONTROLS_LIB)
+#    define Q_QUICKCONTROLS_EXPORT Q_DECL_EXPORT
 #  else
-#    define Q_LABSCONTROLS_EXPORT Q_DECL_IMPORT
+#    define Q_QUICKCONTROLS_EXPORT Q_DECL_IMPORT
 #  endif
 #else
-#  define Q_LABSCONTROLS_EXPORT
+#  define Q_QUICKCONTROLS_EXPORT
 #endif
 
 QT_END_NAMESPACE
 
-#endif // QTLABSCONTROLSSGLOBAL_H
+#endif // QTQUICKCONTROLSGLOBAL_H
diff --git a/src/controls/qtlabscontrolsglobal_p.h b/src/controls/qtquickcontrolsglobal_p.h
index a8938ec5..ff91b44d 100644
--- a/src/controls/qtlabscontrolsglobal_p.h
+++ b/src/controls/qtquickcontrolsglobal_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QTLABSCONTROLSSGLOBAL_P_H
-#define QTLABSCONTROLSSGLOBAL_P_H
+#ifndef QTQUICKCONTROLSGLOBAL_P_H
+#define QTQUICKCONTROLSGLOBAL_P_H
 
 //
 //  W A R N I N G
@@ -48,8 +48,8 @@
 // We mean it.
 //
 
-#include <QtLabsControls/qtlabscontrolsglobal.h>
+#include <QtQuickControls/qtquickcontrolsglobal.h>
 
-#define Q_LABSCONTROLS_PRIVATE_EXPORT Q_LABSCONTROLS_EXPORT
+#define Q_QUICKCONTROLS_PRIVATE_EXPORT Q_QUICKCONTROLS_EXPORT
 
-#endif // QTLABSCONTROLSSGLOBAL_P_H
+#endif // QTQUICKCONTROLSGLOBAL_P_H