Controls: rename the C++ module to qtquickcontrols2

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

examples/controls/gallery/gallery.pro

@@ -1,6 +1,6 @@
 TEMPLATE = app
 TARGET = gallery
-QT += quick quickcontrols
+QT += quick quickcontrols2
 
 SOURCES += \
     gallery.cpp

src/imports/controls/controls.pro

@@ -3,7 +3,7 @@ TARGETPATH = Qt/labs/controls
 IMPORT_VERSION = 1.0
 
 QT += qml quick
-QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private quickcontrols-private
+QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private quickcontrols2-private
 
 DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
 

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 quicktemplates2-private quickcontrols-private
+QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private quickcontrols2-private
 
 DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
 

src/imports/controls/material/qquickmaterialstyle.cpp

@@ -39,7 +39,7 @@
 #include <QtCore/qdebug.h>
 #include <QtCore/qsettings.h>
 #include <QtQml/qqmlinfo.h>
-#include <QtQuickControls/private/qquickstyleattached_p.h>
+#include <QtQuickControls2/private/qquickstyleattached_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/imports/controls/material/qquickmaterialstyle_p.h

@@ -49,7 +49,7 @@
 //
 
 #include <QtGui/qcolor.h>
-#include <QtQuickControls/private/qquickstyleattached_p.h>
+#include <QtQuickControls2/private/qquickstyleattached_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/imports/controls/material/qquickmaterialtheme_p.h

@@ -49,7 +49,7 @@
 //
 
 #include <QtGui/qfont.h>
-#include <QtQuickControls/private/qquickproxytheme_p.h>
+#include <QtQuickControls2/private/qquickproxytheme_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/imports/controls/material/qtquickmaterialstyleplugin.cpp

@@ -34,15 +34,15 @@
 **
 ****************************************************************************/
 
-#include <QtQuickControls/private/qquickstyleplugin_p.h>
+#include <QtQuickControls2/private/qquickstyleplugin_p.h>
 
 #include "qquickmaterialstyle_p.h"
 #include "qquickmaterialtheme_p.h"
 #include "qquickmaterialprogressring_p.h"
 #include "qquickmaterialprogressstrip_p.h"
 
-#include <QtQuickControls/private/qquickstyleselector_p.h>
-#include <QtQuickControls/private/qquickpluginutils_p.h>
+#include <QtQuickControls2/private/qquickstyleselector_p.h>
+#include <QtQuickControls2/private/qquickpluginutils_p.h>
 
 static inline void initResources()
 {

src/imports/controls/qtquickcontrolsplugin.cpp

@@ -40,14 +40,14 @@
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/private/qfileselector_p.h>
 
-#include <QtQuickControls/qquickstyle.h>
+#include <QtQuickControls2/qquickstyle.h>
 #include <QtQuickTemplates2/private/qquickabstractbutton_p.h>
 #include <QtQuickTemplates2/private/qquickbuttongroup_p.h>
 #include <QtQuickTemplates2/private/qquickcontainer_p.h>
 #include <QtQuickTemplates2/private/qquickcontrol_p.h>
 #include <QtQuickTemplates2/private/qquickpopup_p.h>
-#include <QtQuickControls/private/qquickpluginutils_p.h>
-#include <QtQuickControls/private/qquickstyleselector_p.h>
+#include <QtQuickControls2/private/qquickpluginutils_p.h>
+#include <QtQuickControls2/private/qquickstyleselector_p.h>
 
 #include "qquickbusyindicatorring_p.h"
 #include "qquickprogressstrip_p.h"

src/imports/controls/universal/qquickuniversalstyle.cpp

@@ -39,7 +39,7 @@
 #include <QtCore/qdebug.h>
 #include <QtCore/qsettings.h>
 #include <QtQml/qqmlinfo.h>
-#include <QtQuickControls/private/qquickstyleattached_p.h>
+#include <QtQuickControls2/private/qquickstyleattached_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/imports/controls/universal/qquickuniversalstyle_p.h

@@ -49,7 +49,7 @@
 //
 
 #include <QtGui/qcolor.h>
-#include <QtQuickControls/private/qquickstyleattached_p.h>
+#include <QtQuickControls2/private/qquickstyleattached_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/imports/controls/universal/qquickuniversaltheme_p.h

@@ -49,7 +49,7 @@
 //
 
 #include <QtGui/qfont.h>
-#include <QtQuickControls/private/qquickproxytheme_p.h>
+#include <QtQuickControls2/private/qquickproxytheme_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/imports/controls/universal/qtquickuniversalstyleplugin.cpp

@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include <QtQuickControls/private/qquickstyleplugin_p.h>
+#include <QtQuickControls2/private/qquickstyleplugin_p.h>
 
 #include "qquickuniversalfocusrectangle_p.h"
 #include "qquickuniversalprogressring_p.h"
@@ -42,8 +42,8 @@
 #include "qquickuniversalstyle_p.h"
 #include "qquickuniversaltheme_p.h"
 
-#include <QtQuickControls/private/qquickcolorimageprovider_p.h>
-#include <QtQuickControls/private/qquickpluginutils_p.h>
+#include <QtQuickControls2/private/qquickcolorimageprovider_p.h>
+#include <QtQuickControls2/private/qquickpluginutils_p.h>
 
 static inline void initResources()
 {

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 quicktemplates2-private quickcontrols-private
+QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private quickcontrols2-private
 
 DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
 

src/quickcontrols2/qquickcolorimageprovider_p.h

@@ -49,11 +49,11 @@
 //
 
 #include <QtQuick/qquickimageprovider.h>
-#include <QtQuickControls/private/qtquickcontrolsglobal_p.h>
+#include <QtQuickControls2/private/qtquickcontrols2global_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QUICKCONTROLS_PRIVATE_EXPORT QQuickColorImageProvider : public QQuickImageProvider
+class Q_QUICKCONTROLS2_PRIVATE_EXPORT QQuickColorImageProvider : public QQuickImageProvider
 {
 public:
     QQuickColorImageProvider(const QString &path);

src/quickcontrols2/qquickpaddedrectangle_p.h

@@ -49,11 +49,11 @@
 //
 
 #include <QtQuick/private/qquickrectangle_p.h>
-#include <QtQuickControls/private/qtquickcontrolsglobal_p.h>
+#include <QtQuickControls2/private/qtquickcontrols2global_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QUICKCONTROLS_PRIVATE_EXPORT QQuickPaddedRectangle : public QQuickRectangle
+class Q_QUICKCONTROLS2_PRIVATE_EXPORT QQuickPaddedRectangle : public QQuickRectangle
 {
     Q_OBJECT
     Q_PROPERTY(qreal padding READ padding WRITE setPadding RESET resetPadding NOTIFY paddingChanged FINAL)

src/quickcontrols2/qquickpluginutils_p.h

@@ -51,14 +51,14 @@
 #include <QtCore/qurl.h>
 #include <QtCore/qstring.h>
 #include <QtQml/qqmlextensionplugin.h>
-#include "qtquickcontrolsglobal_p.h"
+#include <QtQuickControls2/private/qtquickcontrols2global_p.h>
 
 QT_BEGIN_NAMESPACE
 
 namespace QQuickPluginUtils
 {
-    Q_QUICKCONTROLS_PRIVATE_EXPORT QString pluginBasePath(const QQmlExtensionPlugin &plugin);
-    Q_QUICKCONTROLS_PRIVATE_EXPORT QUrl pluginBaseUrl(const QQmlExtensionPlugin &plugin);
+    Q_QUICKCONTROLS2_PRIVATE_EXPORT QString pluginBasePath(const QQmlExtensionPlugin &plugin);
+    Q_QUICKCONTROLS2_PRIVATE_EXPORT QUrl pluginBaseUrl(const QQmlExtensionPlugin &plugin);
 }
 
 QT_END_NAMESPACE

src/quickcontrols2/qquickproxytheme_p.h

@@ -49,11 +49,11 @@
 //
 
 #include <QtGui/qpa/qplatformtheme.h>
-#include <QtQuickControls/private/qtquickcontrolsglobal_p.h>
+#include <QtQuickControls2/private/qtquickcontrols2global_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QUICKCONTROLS_PRIVATE_EXPORT QQuickProxyTheme :  public QPlatformTheme
+class Q_QUICKCONTROLS2_PRIVATE_EXPORT QQuickProxyTheme :  public QPlatformTheme
 {
 public:
     explicit QQuickProxyTheme(QPlatformTheme *theme = nullptr);

src/quickcontrols2/qquickstyle.h

@@ -39,11 +39,11 @@
 
 #include <QtCore/qurl.h>
 #include <QtCore/qstring.h>
-#include <QtQuickControls/qtquickcontrolsglobal.h>
+#include <QtQuickControls2/qtquickcontrols2global.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QUICKCONTROLS_EXPORT QQuickStyle
+class Q_QUICKCONTROLS2_EXPORT QQuickStyle
 {
 public:
     static QString name();

src/quickcontrols2/qquickstyleattached_p.h

@@ -54,13 +54,13 @@
 #include <QtCore/qpointer.h>
 #include <QtCore/qsharedpointer.h>
 #include <QtQuick/private/qquickitemchangelistener_p.h>
-#include <QtQuickControls/private/qtquickcontrolsglobal_p.h>
+#include <QtQuickControls2/private/qtquickcontrols2global_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QSettings;
 
-class Q_QUICKCONTROLS_PRIVATE_EXPORT QQuickStyleAttached : public QObject, public QQuickItemChangeListener
+class Q_QUICKCONTROLS2_PRIVATE_EXPORT QQuickStyleAttached : public QObject, public QQuickItemChangeListener
 {
     Q_OBJECT
 

src/quickcontrols2/qquickstyleplugin_p.h

@@ -50,13 +50,13 @@
 
 #include <QtCore/qscopedpointer.h>
 #include <QtQml/qqmlextensionplugin.h>
-#include <QtQuickControls/private/qtquickcontrolsglobal_p.h>
+#include <QtQuickControls2/private/qtquickcontrols2global_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickProxyTheme;
 
-class Q_QUICKCONTROLS_PRIVATE_EXPORT QQuickStylePlugin : public QQmlExtensionPlugin
+class Q_QUICKCONTROLS2_PRIVATE_EXPORT QQuickStylePlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
 

src/quickcontrols2/qquickstyleselector_p.h

@@ -49,13 +49,13 @@
 #include <QtCore/qurl.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qscopedpointer.h>
-#include <QtQuickControls/private/qtquickcontrolsglobal_p.h>
+#include <QtQuickControls2/private/qtquickcontrols2global_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickStyleSelectorPrivate;
 
-class Q_QUICKCONTROLS_PRIVATE_EXPORT QQuickStyleSelector
+class Q_QUICKCONTROLS2_PRIVATE_EXPORT QQuickStyleSelector
 {
 public:
     QQuickStyleSelector();

src/quickcontrols2/qquickstyleselector_p_p.h

@@ -46,7 +46,7 @@
 // We mean it.
 //
 
-#include <QtQuickControls/private/qquickstyleselector_p.h>
+#include <QtQuickControls2/private/qquickstyleselector_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/quickcontrols2/qtquickcontrols2global.h

@@ -34,23 +34,23 @@
 **
 ****************************************************************************/
 
-#ifndef QTQUICKCONTROLSGLOBAL_H
-#define QTQUICKCONTROLSGLOBAL_H
+#ifndef QTQUICKCONTROLS2GLOBAL_H
+#define QTQUICKCONTROLS2GLOBAL_H
 
 #include <QtCore/qglobal.h>
 
 QT_BEGIN_NAMESPACE
 
 #ifndef QT_STATIC
-#  if defined(QT_BUILD_QUICKCONTROLS_LIB)
-#    define Q_QUICKCONTROLS_EXPORT Q_DECL_EXPORT
+#  if defined(QT_BUILD_QUICKCONTROLS2_LIB)
+#    define Q_QUICKCONTROLS2_EXPORT Q_DECL_EXPORT
 #  else
-#    define Q_QUICKCONTROLS_EXPORT Q_DECL_IMPORT
+#    define Q_QUICKCONTROLS2_EXPORT Q_DECL_IMPORT
 #  endif
 #else
-#  define Q_QUICKCONTROLS_EXPORT
+#  define Q_QUICKCONTROLS2_EXPORT
 #endif
 
 QT_END_NAMESPACE
 
-#endif // QTQUICKCONTROLSGLOBAL_H
+#endif // QTQUICKCONTROLS2GLOBAL_H

src/quickcontrols2/qtquickcontrols2global_p.h

@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QTQUICKCONTROLSGLOBAL_P_H
-#define QTQUICKCONTROLSGLOBAL_P_H
+#ifndef QTQUICKCONTROLS2GLOBAL_P_H
+#define QTQUICKCONTROLS2GLOBAL_P_H
 
 //
 //  W A R N I N G
@@ -48,8 +48,8 @@
 // We mean it.
 //
 
-#include <QtQuickControls/qtquickcontrolsglobal.h>
+#include <QtQuickControls2/qtquickcontrols2global.h>
 
-#define Q_QUICKCONTROLS_PRIVATE_EXPORT Q_QUICKCONTROLS_EXPORT
+#define Q_QUICKCONTROLS2_PRIVATE_EXPORT Q_QUICKCONTROLS2_EXPORT
 
-#endif // QTQUICKCONTROLSGLOBAL_P_H
+#endif // QTQUICKCONTROLS2GLOBAL_P_H

src/quickcontrols2/quickcontrols2.pro

@@ -1,5 +1,5 @@
-TARGET = QtQuickControls
-MODULE = quickcontrols
+TARGET = QtQuickControls2
+MODULE = quickcontrols2
 
 QT += quick
 QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private
@@ -7,8 +7,8 @@ QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2
 DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
 
 HEADERS += \
-    $$PWD/qtquickcontrolsglobal.h
-    $$PWD/qtquickcontrolsglobal_p.h
+    $$PWD/qtquickcontrols2global.h
+    $$PWD/qtquickcontrols2global_p.h
 
-include(controls.pri)
+include(quickcontrols2.pri)
 load(qt_module)

src/src.pro

@@ -1,8 +1,8 @@
 TEMPLATE = subdirs
 SUBDIRS += \
     quicktemplates2 \
-    controls \
+    quickcontrols2 \
     imports
 
-controls.depends = quicktemplates2
-imports.depends = controls quicktemplates2
+quickcontrols2.depends = quicktemplates2
+imports.depends = quickcontrols2 quicktemplates2

sync.profile

@@ -1,5 +1,5 @@
 %modules = ( # path to module name map
-    "QtQuickControls" => "$basedir/src/controls",
+    "QtQuickControls2" => "$basedir/src/quickcontrols2",
     "QtQuickTemplates2" => "$basedir/src/quicktemplates2",
 );
 %moduleheaders = ( # restrict the module headers to those found in relative path

tests/auto/applicationwindow/applicationwindow.pro

@@ -4,7 +4,7 @@ SOURCES += tst_applicationwindow.cpp
 
 osx:CONFIG -= app_bundle
 
-QT += core-private gui-private qml-private quick-private quicktemplates2-private quickcontrols-private testlib
+QT += core-private gui-private qml-private quick-private quicktemplates2-private quickcontrols2-private testlib
 
 include (../shared/util.pri)
 

tests/auto/applicationwindow/tst_applicationwindow.cpp

@@ -48,7 +48,7 @@
 #include <QtQuickTemplates2/private/qquicklabel_p.h>
 #include <QtQuickTemplates2/private/qquicktextarea_p.h>
 #include <QtQuickTemplates2/private/qquicktextfield_p.h>
-#include <QtQuickControls/private/qquickproxytheme_p.h>
+#include <QtQuickControls2/private/qquickproxytheme_p.h>
 #include "../shared/util.h"
 #include "../shared/visualtestutil.h"