diff options
Diffstat (limited to 'src/imports')
20 files changed, 65 insertions, 65 deletions
diff --git a/src/imports/calendar/calendar.pro b/src/imports/calendar/calendar.pro index f7fc993b..e8e29b8f 100644 --- a/src/imports/calendar/calendar.pro +++ b/src/imports/calendar/calendar.pro @@ -3,7 +3,7 @@ TARGETPATH = QtQuick/Calendar.2 IMPORT_VERSION = 2.0 QT += qml quick -QT += core-private gui-private qml-private quick-private quickcontrols2-private +QT += core-private gui-private qml-private quick-private quicktemplates-private DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII diff --git a/src/imports/calendar/qquickcalendarview.cpp b/src/imports/calendar/qquickcalendarview.cpp index bdc67d43..23ed9dd3 100644 --- a/src/imports/calendar/qquickcalendarview.cpp +++ b/src/imports/calendar/qquickcalendarview.cpp @@ -39,7 +39,7 @@ #include <QtGui/qstylehints.h> #include <QtGui/qguiapplication.h> -#include <QtQuickControls/private/qquickcontrol_p_p.h> +#include <QtQuickTemplates/private/qquickcontrol_p_p.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/calendar/qquickcalendarview_p.h b/src/imports/calendar/qquickcalendarview_p.h index f391d919..e69b5ddf 100644 --- a/src/imports/calendar/qquickcalendarview_p.h +++ b/src/imports/calendar/qquickcalendarview_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQuickControls/private/qquickcontrol_p.h> +#include <QtQuickTemplates/private/qquickcontrol_p.h> #include <QtCore/qlocale.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/calendar/qquickdayofweekrow.cpp b/src/imports/calendar/qquickdayofweekrow.cpp index e4b42302..9ace5bdd 100644 --- a/src/imports/calendar/qquickdayofweekrow.cpp +++ b/src/imports/calendar/qquickdayofweekrow.cpp @@ -37,7 +37,7 @@ #include "qquickdayofweekrow_p.h" #include "qquickdayofweekmodel_p.h" -#include <QtQuickControls/private/qquickcontrol_p_p.h> +#include <QtQuickTemplates/private/qquickcontrol_p_p.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/calendar/qquickdayofweekrow_p.h b/src/imports/calendar/qquickdayofweekrow_p.h index 83b32dd7..e0ea0939 100644 --- a/src/imports/calendar/qquickdayofweekrow_p.h +++ b/src/imports/calendar/qquickdayofweekrow_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQuickControls/private/qquickcontrol_p.h> +#include <QtQuickTemplates/private/qquickcontrol_p.h> #include <QtCore/qlocale.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/calendar/qquickweeknumbercolumn.cpp b/src/imports/calendar/qquickweeknumbercolumn.cpp index 56c4af97..12f61bd4 100644 --- a/src/imports/calendar/qquickweeknumbercolumn.cpp +++ b/src/imports/calendar/qquickweeknumbercolumn.cpp @@ -37,7 +37,7 @@ #include "qquickweeknumbercolumn_p.h" #include "qquickweeknumbermodel_p.h" -#include <QtQuickControls/private/qquickcontrol_p_p.h> +#include <QtQuickTemplates/private/qquickcontrol_p_p.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/calendar/qquickweeknumbercolumn_p.h b/src/imports/calendar/qquickweeknumbercolumn_p.h index 423cd99a..efc2c172 100644 --- a/src/imports/calendar/qquickweeknumbercolumn_p.h +++ b/src/imports/calendar/qquickweeknumbercolumn_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQuickControls/private/qquickcontrol_p.h> +#include <QtQuickTemplates/private/qquickcontrol_p.h> #include <QtCore/qlocale.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/controls/controls.pro b/src/imports/controls/controls.pro index 3503294f..d3b0bbcc 100644 --- a/src/imports/controls/controls.pro +++ b/src/imports/controls/controls.pro @@ -3,7 +3,7 @@ TARGETPATH = QtQuick/Controls.2 IMPORT_VERSION = 2.0 QT += qml quick -QT += core-private gui-private qml-private quick-private quickcontrols2-private +QT += core-private gui-private qml-private quick-private quicktemplates-private OTHER_FILES += \ qmldir diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp index 6c0f9ecc..fcc263a8 100644 --- a/src/imports/controls/qtquickcontrols2plugin.cpp +++ b/src/imports/controls/qtquickcontrols2plugin.cpp @@ -37,29 +37,29 @@ #include <QtQml/qqmlextensionplugin.h> #include <QtCore/qdir.h> -#include <QtQuickControls/private/qquickexclusivegroup_p.h> -#include <QtQuickControls/private/qquickapplicationwindow_p.h> -#include <QtQuickControls/private/qquickbusyindicator_p.h> -#include <QtQuickControls/private/qquickbutton_p.h> -#include <QtQuickControls/private/qquickcheckbox_p.h> -#include <QtQuickControls/private/qquickframe_p.h> -#include <QtQuickControls/private/qquickgroupbox_p.h> -#include <QtQuickControls/private/qquicklabel_p.h> -#include <QtQuickControls/private/qquickpageindicator_p.h> -#include <QtQuickControls/private/qquickprogressbar_p.h> -#include <QtQuickControls/private/qquickradiobutton_p.h> -#include <QtQuickControls/private/qquickscrollbar_p.h> -#include <QtQuickControls/private/qquickscrollindicator_p.h> -#include <QtQuickControls/private/qquickslider_p.h> -#include <QtQuickControls/private/qquickstackview_p.h> -#include <QtQuickControls/private/qquickswitch_p.h> -#include <QtQuickControls/private/qquicktabbar_p.h> -#include <QtQuickControls/private/qquicktabbutton_p.h> -#include <QtQuickControls/private/qquicktextarea_p.h> -#include <QtQuickControls/private/qquicktextfield_p.h> -#include <QtQuickControls/private/qquicktogglebutton_p.h> -#include <QtQuickControls/private/qquicktoolbar_p.h> -#include <QtQuickControls/private/qquicktoolbutton_p.h> +#include <QtQuickTemplates/private/qquickexclusivegroup_p.h> +#include <QtQuickTemplates/private/qquickapplicationwindow_p.h> +#include <QtQuickTemplates/private/qquickbusyindicator_p.h> +#include <QtQuickTemplates/private/qquickbutton_p.h> +#include <QtQuickTemplates/private/qquickcheckbox_p.h> +#include <QtQuickTemplates/private/qquickframe_p.h> +#include <QtQuickTemplates/private/qquickgroupbox_p.h> +#include <QtQuickTemplates/private/qquicklabel_p.h> +#include <QtQuickTemplates/private/qquickpageindicator_p.h> +#include <QtQuickTemplates/private/qquickprogressbar_p.h> +#include <QtQuickTemplates/private/qquickradiobutton_p.h> +#include <QtQuickTemplates/private/qquickscrollbar_p.h> +#include <QtQuickTemplates/private/qquickscrollindicator_p.h> +#include <QtQuickTemplates/private/qquickslider_p.h> +#include <QtQuickTemplates/private/qquickstackview_p.h> +#include <QtQuickTemplates/private/qquickswitch_p.h> +#include <QtQuickTemplates/private/qquicktabbar_p.h> +#include <QtQuickTemplates/private/qquicktabbutton_p.h> +#include <QtQuickTemplates/private/qquicktextarea_p.h> +#include <QtQuickTemplates/private/qquicktextfield_p.h> +#include <QtQuickTemplates/private/qquicktogglebutton_p.h> +#include <QtQuickTemplates/private/qquicktoolbar_p.h> +#include <QtQuickTemplates/private/qquicktoolbutton_p.h> #include "qquicktheme_p.h" void initResources() diff --git a/src/imports/extras/extras.pro b/src/imports/extras/extras.pro index 1046cec4..fd3dcc1e 100644 --- a/src/imports/extras/extras.pro +++ b/src/imports/extras/extras.pro @@ -3,7 +3,7 @@ TARGETPATH = QtQuick/Extras.2 IMPORT_VERSION = 2.0 QT += qml quick -QT += core-private gui-private qml-private quick-private quickcontrols2-private +QT += core-private gui-private qml-private quick-private quicktemplates-private QMAKE_DOCS = $$PWD/doc/qtquickextras2.qdocconf diff --git a/src/imports/extras/qquickdial.cpp b/src/imports/extras/qquickdial.cpp index fe196659..aa93e9ca 100644 --- a/src/imports/extras/qquickdial.cpp +++ b/src/imports/extras/qquickdial.cpp @@ -38,7 +38,7 @@ #include <QtCore/qmath.h> #include <QtQuick/private/qquickflickable_p.h> -#include <QtQuickControls/private/qquickcontrol_p_p.h> +#include <QtQuickTemplates/private/qquickcontrol_p_p.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/extras/qquickdial_p.h b/src/imports/extras/qquickdial_p.h index 6e3f4e6a..0b5cda35 100644 --- a/src/imports/extras/qquickdial_p.h +++ b/src/imports/extras/qquickdial_p.h @@ -50,7 +50,7 @@ #include <QtCore/qvariant.h> #include <QtQml/qqmlcomponent.h> -#include <QtQuickControls/private/qquickcontrol_p.h> +#include <QtQuickTemplates/private/qquickcontrol_p.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/extras/qquickdrawer.cpp b/src/imports/extras/qquickdrawer.cpp index 7c61688a..1bb9c6f6 100644 --- a/src/imports/extras/qquickdrawer.cpp +++ b/src/imports/extras/qquickdrawer.cpp @@ -40,7 +40,7 @@ #include <QtGui/private/qguiapplication_p.h> #include <QtQuick/private/qquickwindow_p.h> #include <QtQuick/private/qquickanimation_p.h> -#include <QtQuickControls/private/qquickcontrol_p_p.h> +#include <QtQuickTemplates/private/qquickcontrol_p_p.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/extras/qquickdrawer_p.h b/src/imports/extras/qquickdrawer_p.h index 2a45f5b1..00af2164 100644 --- a/src/imports/extras/qquickdrawer_p.h +++ b/src/imports/extras/qquickdrawer_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQuickControls/private/qquickcontrol_p.h> +#include <QtQuickTemplates/private/qquickcontrol_p.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/extras/qquickswipeview.cpp b/src/imports/extras/qquickswipeview.cpp index ec76d7f2..c6203f23 100644 --- a/src/imports/extras/qquickswipeview.cpp +++ b/src/imports/extras/qquickswipeview.cpp @@ -36,7 +36,7 @@ #include "qquickswipeview_p.h" -#include <QtQuickControls/private/qquickcontainer_p_p.h> +#include <QtQuickTemplates/private/qquickcontainer_p_p.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/extras/qquickswipeview_p.h b/src/imports/extras/qquickswipeview_p.h index 68f08783..5541a677 100644 --- a/src/imports/extras/qquickswipeview_p.h +++ b/src/imports/extras/qquickswipeview_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQuickControls/private/qquickcontainer_p.h> +#include <QtQuickTemplates/private/qquickcontainer_p.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/extras/qquicktumbler.cpp b/src/imports/extras/qquicktumbler.cpp index 53a8af8f..dd24693b 100644 --- a/src/imports/extras/qquicktumbler.cpp +++ b/src/imports/extras/qquicktumbler.cpp @@ -37,7 +37,7 @@ #include "qquicktumbler_p.h" #include <QtQuick/private/qquickflickable_p.h> -#include <QtQuickControls/private/qquickcontrol_p_p.h> +#include <QtQuickTemplates/private/qquickcontrol_p_p.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/extras/qquicktumbler_p.h b/src/imports/extras/qquicktumbler_p.h index bda2a020..948382e4 100644 --- a/src/imports/extras/qquicktumbler_p.h +++ b/src/imports/extras/qquicktumbler_p.h @@ -50,7 +50,7 @@ #include <QtCore/qvariant.h> #include <QtQml/qqmlcomponent.h> -#include <QtQuickControls/private/qquickcontrol_p.h> +#include <QtQuickTemplates/private/qquickcontrol_p.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/templates/qtquicktemplates2plugin.cpp b/src/imports/templates/qtquicktemplates2plugin.cpp index 80f034bb..8d76c86b 100644 --- a/src/imports/templates/qtquicktemplates2plugin.cpp +++ b/src/imports/templates/qtquicktemplates2plugin.cpp @@ -36,30 +36,30 @@ #include <QtQml/qqmlextensionplugin.h> -#include <QtQuickControls/private/qquickapplicationwindow_p.h> -#include <QtQuickControls/private/qquickbusyindicator_p.h> -#include <QtQuickControls/private/qquickbutton_p.h> -#include <QtQuickControls/private/qquickcheckbox_p.h> -#include <QtQuickControls/private/qquickcontrol_p.h> -#include <QtQuickControls/private/qquickcontainer_p.h> -#include <QtQuickControls/private/qquickframe_p.h> -#include <QtQuickControls/private/qquickgroupbox_p.h> -#include <QtQuickControls/private/qquicklabel_p.h> -#include <QtQuickControls/private/qquickpageindicator_p.h> -#include <QtQuickControls/private/qquickprogressbar_p.h> -#include <QtQuickControls/private/qquickradiobutton_p.h> -#include <QtQuickControls/private/qquickscrollbar_p.h> -#include <QtQuickControls/private/qquickscrollindicator_p.h> -#include <QtQuickControls/private/qquickslider_p.h> -#include <QtQuickControls/private/qquickstackview_p.h> -#include <QtQuickControls/private/qquickswitch_p.h> -#include <QtQuickControls/private/qquicktabbar_p.h> -#include <QtQuickControls/private/qquicktabbutton_p.h> -#include <QtQuickControls/private/qquicktextarea_p.h> -#include <QtQuickControls/private/qquicktextfield_p.h> -#include <QtQuickControls/private/qquicktogglebutton_p.h> -#include <QtQuickControls/private/qquicktoolbar_p.h> -#include <QtQuickControls/private/qquicktoolbutton_p.h> +#include <QtQuickTemplates/private/qquickapplicationwindow_p.h> +#include <QtQuickTemplates/private/qquickbusyindicator_p.h> +#include <QtQuickTemplates/private/qquickbutton_p.h> +#include <QtQuickTemplates/private/qquickcheckbox_p.h> +#include <QtQuickTemplates/private/qquickcontrol_p.h> +#include <QtQuickTemplates/private/qquickcontainer_p.h> +#include <QtQuickTemplates/private/qquickframe_p.h> +#include <QtQuickTemplates/private/qquickgroupbox_p.h> +#include <QtQuickTemplates/private/qquicklabel_p.h> +#include <QtQuickTemplates/private/qquickpageindicator_p.h> +#include <QtQuickTemplates/private/qquickprogressbar_p.h> +#include <QtQuickTemplates/private/qquickradiobutton_p.h> +#include <QtQuickTemplates/private/qquickscrollbar_p.h> +#include <QtQuickTemplates/private/qquickscrollindicator_p.h> +#include <QtQuickTemplates/private/qquickslider_p.h> +#include <QtQuickTemplates/private/qquickstackview_p.h> +#include <QtQuickTemplates/private/qquickswitch_p.h> +#include <QtQuickTemplates/private/qquicktabbar_p.h> +#include <QtQuickTemplates/private/qquicktabbutton_p.h> +#include <QtQuickTemplates/private/qquicktextarea_p.h> +#include <QtQuickTemplates/private/qquicktextfield_p.h> +#include <QtQuickTemplates/private/qquicktogglebutton_p.h> +#include <QtQuickTemplates/private/qquicktoolbar_p.h> +#include <QtQuickTemplates/private/qquicktoolbutton_p.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/templates/templates.pro b/src/imports/templates/templates.pro index c264b0ff..07e96aa1 100644 --- a/src/imports/templates/templates.pro +++ b/src/imports/templates/templates.pro @@ -3,7 +3,7 @@ TARGETPATH = QtQuick/Templates.2 IMPORT_VERSION = 2.0 QT += qml quick -QT += core-private gui-private qml-private quick-private quickcontrols2-private +QT += core-private gui-private qml-private quick-private quicktemplates-private OTHER_FILES += \ qmldir |