diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-04-13 15:59:53 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-04-13 15:28:11 +0000 |
| commit | a60c8e60d508117ddf48876b44d31e6d5ab98da6 (patch) | |
| tree | 8bf008a1bf8dc34338450eee86d2b55e84cba36c /src/controls | |
| parent | e719087dce50d739c723c5ef9af2a9226318aa02 (diff) | |
Templates: rename the C++ module to qtquicktemplates2
Change-Id: I146da903b46f5c2caf865e37291c25376b49021a
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/controls')
| -rw-r--r-- | src/controls/controls.pro | 2 | ||||
| -rw-r--r-- | src/controls/qquickstyleattached.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/controls.pro b/src/controls/controls.pro index 16f2005c..5a5ffb01 100644 --- a/src/controls/controls.pro +++ b/src/controls/controls.pro @@ -2,7 +2,7 @@ TARGET = QtQuickControls MODULE = quickcontrols QT += quick -QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates-private +QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII diff --git a/src/controls/qquickstyleattached.cpp b/src/controls/qquickstyleattached.cpp index 0ac47ed1..a815b956 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 <QtQuickTemplates/private/qquickpopup_p.h> +#include <QtQuickTemplates2/private/qquickpopup_p.h> QT_BEGIN_NAMESPACE |