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/imports/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/imports/controls')
| -rw-r--r-- | src/imports/controls/controls.pro | 2 | ||||
| -rw-r--r-- | src/imports/controls/doc/qtquickcontrols2.qdocconf | 6 | ||||
| -rw-r--r-- | src/imports/controls/material/material.pro | 2 | ||||
| -rw-r--r-- | src/imports/controls/qtquickcontrolsplugin.cpp | 10 | ||||
| -rw-r--r-- | src/imports/controls/universal/universal.pro | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/src/imports/controls/controls.pro b/src/imports/controls/controls.pro index ea8da342..281689ef 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 quicktemplates-private quickcontrols-private +QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private quickcontrols-private DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII diff --git a/src/imports/controls/doc/qtquickcontrols2.qdocconf b/src/imports/controls/doc/qtquickcontrols2.qdocconf index 3466d457..96176fcc 100644 --- a/src/imports/controls/doc/qtquickcontrols2.qdocconf +++ b/src/imports/controls/doc/qtquickcontrols2.qdocconf @@ -30,18 +30,18 @@ depends = qtcore qtgui qtdoc qtqml qtquick qtquickdialogs qtquickcontrols qmake # \example controls/tabs exampledirs += ../../../../examples/controls \ ../ \ - ../../../templates \ + ../../../quicktemplates2 \ ../../calendar \ ../../../../tests/auto/controls/data \ snippets examplesinstallpath = qtquickcontrols2/controls -headerdirs += ../../../templates \ +headerdirs += ../../../quicktemplates2 \ ../../calendar \ ../../../controls -sourcedirs += ../../../templates \ +sourcedirs += ../../../quicktemplates2 \ ../../calendar \ ../../../controls \ src diff --git a/src/imports/controls/material/material.pro b/src/imports/controls/material/material.pro index 667235ab..10b46885 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 quicktemplates-private quickcontrols-private +QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private quickcontrols-private DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII diff --git a/src/imports/controls/qtquickcontrolsplugin.cpp b/src/imports/controls/qtquickcontrolsplugin.cpp index e8b1e386..442dce69 100644 --- a/src/imports/controls/qtquickcontrolsplugin.cpp +++ b/src/imports/controls/qtquickcontrolsplugin.cpp @@ -41,11 +41,11 @@ #include <QtCore/private/qfileselector_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 <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> diff --git a/src/imports/controls/universal/universal.pro b/src/imports/controls/universal/universal.pro index 14058547..83720408 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 quicktemplates-private quickcontrols-private +QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private quickcontrols-private DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII |