diff options
Diffstat (limited to 'src/imports/controls')
12 files changed, 18 insertions, 18 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 |