Controls: rename the C++ module to qtquickcontrols2

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

34 files changed, 56 insertions, 56 deletions

diff --git a/src/imports/controls/controls.pro b/src/imports/controls/controls.pro
index 281689ef..d9dfca4c 100644
--- a/src/imports/controls/controls.pro
+++ b/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
 
diff --git a/src/imports/controls/material/material.pro b/src/imports/controls/material/material.pro
index 10b46885..33c1d59a 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 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
 
diff --git a/src/imports/controls/material/qquickmaterialstyle.cpp b/src/imports/controls/material/qquickmaterialstyle.cpp
index 27ffca4d..2b845f48 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 <QtQuickControls/private/qquickstyleattached_p.h>
+#include <QtQuickControls2/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 5b1a31ea..cde8b4a6 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 <QtQuickControls/private/qquickstyleattached_p.h>
+#include <QtQuickControls2/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 f88842dd..a364cd55 100644
--- a/src/imports/controls/material/qquickmaterialtheme_p.h
+++ b/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
 
diff --git a/src/imports/controls/material/qtquickmaterialstyleplugin.cpp b/src/imports/controls/material/qtquickmaterialstyleplugin.cpp
index 8dca71fd..8b8e5718 100644
--- a/src/imports/controls/material/qtquickmaterialstyleplugin.cpp
+++ b/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()
 {
diff --git a/src/imports/controls/qtquickcontrolsplugin.cpp b/src/imports/controls/qtquickcontrolsplugin.cpp
index 442dce69..970c0ca3 100644
--- a/src/imports/controls/qtquickcontrolsplugin.cpp
+++ b/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"
diff --git a/src/imports/controls/universal/qquickuniversalstyle.cpp b/src/imports/controls/universal/qquickuniversalstyle.cpp
index ccbdfb29..c178e6a0 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 <QtQuickControls/private/qquickstyleattached_p.h>
+#include <QtQuickControls2/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 b0787389..144c2601 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 <QtQuickControls/private/qquickstyleattached_p.h>
+#include <QtQuickControls2/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 0435d46c..2015431c 100644
--- a/src/imports/controls/universal/qquickuniversaltheme_p.h
+++ b/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
 
diff --git a/src/imports/controls/universal/qtquickuniversalstyleplugin.cpp b/src/imports/controls/universal/qtquickuniversalstyleplugin.cpp
index addd65f4..96c08a6a 100644
--- a/src/imports/controls/universal/qtquickuniversalstyleplugin.cpp
+++ b/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()
 {
diff --git a/src/imports/controls/universal/universal.pro b/src/imports/controls/universal/universal.pro
index 83720408..658026c8 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 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
 
diff --git a/src/controls/qquickcolorimageprovider.cpp b/src/quickcontrols2/qquickcolorimageprovider.cpp
index 9fc55d00..9fc55d00 100644
--- a/src/controls/qquickcolorimageprovider.cpp
+++ b/src/quickcontrols2/qquickcolorimageprovider.cpp
diff --git a/src/controls/qquickcolorimageprovider_p.h b/src/quickcontrols2/qquickcolorimageprovider_p.h
index 475449d5..9264983e 100644
--- a/src/controls/qquickcolorimageprovider_p.h
+++ b/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);
diff --git a/src/controls/qquickpaddedrectangle.cpp b/src/quickcontrols2/qquickpaddedrectangle.cpp
index 9542ca5f..9542ca5f 100644
--- a/src/controls/qquickpaddedrectangle.cpp
+++ b/src/quickcontrols2/qquickpaddedrectangle.cpp
diff --git a/src/controls/qquickpaddedrectangle_p.h b/src/quickcontrols2/qquickpaddedrectangle_p.h
index b8c8dc4a..8760b272 100644
--- a/src/controls/qquickpaddedrectangle_p.h
+++ b/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)
diff --git a/src/controls/qquickpluginutils.cpp b/src/quickcontrols2/qquickpluginutils.cpp
index d67912ce..d67912ce 100644
--- a/src/controls/qquickpluginutils.cpp
+++ b/src/quickcontrols2/qquickpluginutils.cpp
diff --git a/src/controls/qquickpluginutils_p.h b/src/quickcontrols2/qquickpluginutils_p.h
index 01a25ea5..2dc5ddd1 100644
--- a/src/controls/qquickpluginutils_p.h
+++ b/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
diff --git a/src/controls/qquickproxytheme.cpp b/src/quickcontrols2/qquickproxytheme.cpp
index 03ccb3b2..03ccb3b2 100644
--- a/src/controls/qquickproxytheme.cpp
+++ b/src/quickcontrols2/qquickproxytheme.cpp
diff --git a/src/controls/qquickproxytheme_p.h b/src/quickcontrols2/qquickproxytheme_p.h
index 69446669..5e4b6769 100644
--- a/src/controls/qquickproxytheme_p.h
+++ b/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);
diff --git a/src/controls/qquickstyle.cpp b/src/quickcontrols2/qquickstyle.cpp
index 917907c6..917907c6 100644
--- a/src/controls/qquickstyle.cpp
+++ b/src/quickcontrols2/qquickstyle.cpp
diff --git a/src/controls/qquickstyle.h b/src/quickcontrols2/qquickstyle.h
index 6946a214..87452cb7 100644
--- a/src/controls/qquickstyle.h
+++ b/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();
diff --git a/src/controls/qquickstyleattached.cpp b/src/quickcontrols2/qquickstyleattached.cpp
index a815b956..a815b956 100644
--- a/src/controls/qquickstyleattached.cpp
+++ b/src/quickcontrols2/qquickstyleattached.cpp
diff --git a/src/controls/qquickstyleattached_p.h b/src/quickcontrols2/qquickstyleattached_p.h
index 7835a482..2140f2b7 100644
--- a/src/controls/qquickstyleattached_p.h
+++ b/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
 
diff --git a/src/controls/qquickstyleplugin.cpp b/src/quickcontrols2/qquickstyleplugin.cpp
index ceb6531e..ceb6531e 100644
--- a/src/controls/qquickstyleplugin.cpp
+++ b/src/quickcontrols2/qquickstyleplugin.cpp
diff --git a/src/controls/qquickstyleplugin_p.h b/src/quickcontrols2/qquickstyleplugin_p.h
index 93be0aa8..b636ac27 100644
--- a/src/controls/qquickstyleplugin_p.h
+++ b/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
 
diff --git a/src/controls/qquickstyleselector.cpp b/src/quickcontrols2/qquickstyleselector.cpp
index 64e9d500..64e9d500 100644
--- a/src/controls/qquickstyleselector.cpp
+++ b/src/quickcontrols2/qquickstyleselector.cpp
diff --git a/src/controls/qquickstyleselector_p.h b/src/quickcontrols2/qquickstyleselector_p.h
index 5c6434cb..3343c9da 100644
--- a/src/controls/qquickstyleselector_p.h
+++ b/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();
diff --git a/src/controls/qquickstyleselector_p_p.h b/src/quickcontrols2/qquickstyleselector_p_p.h
index 9f831428..bd3e1700 100644
--- a/src/controls/qquickstyleselector_p_p.h
+++ b/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
 
diff --git a/src/controls/qtquickcontrolsglobal.h b/src/quickcontrols2/qtquickcontrols2global.h
index 98926da4..2088da22 100644
--- a/src/controls/qtquickcontrolsglobal.h
+++ b/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
diff --git a/src/controls/qtquickcontrolsglobal_p.h b/src/quickcontrols2/qtquickcontrols2global_p.h
index ff91b44d..d5dbeff1 100644
--- a/src/controls/qtquickcontrolsglobal_p.h
+++ b/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
diff --git a/src/controls/controls.pri b/src/quickcontrols2/quickcontrols2.pri
index 5424c5c7..5424c5c7 100644
--- a/src/controls/controls.pri
+++ b/src/quickcontrols2/quickcontrols2.pri
diff --git a/src/controls/controls.pro b/src/quickcontrols2/quickcontrols2.pro
index 5a5ffb01..bdad3095 100644
--- a/src/controls/controls.pro
+++ b/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)
diff --git a/src/src.pro b/src/src.pro
index 428dc642..7f945ffb 100644
--- a/src/src.pro
+++ b/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