diff options
| author | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2016-03-16 16:37:02 +0100 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2016-03-18 11:51:12 +0000 |
| commit | a0d44a16535cc6e751045185e40bbd6c6edaf87a (patch) | |
| tree | 9a9251ad017e5f65f9017d83510ae0d438997c8c /src/imports/calendar | |
| parent | 3b73180ca021411a08fab64a3e49e15ba234aa9e (diff) | |
Rename Qt Labs Controls to Qt Quick Controls 2 - build system
The imports will be done later, as we don't want to change them until
the module is releasable (which requires things like selection handles,
etc.).
Change-Id: I2140cff7058fc3b696e92ca8c0e5e06dca9a7c9c
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/imports/calendar')
| -rw-r--r-- | src/imports/calendar/calendar.pro | 2 | ||||
| -rw-r--r-- | src/imports/calendar/qquickdayofweekrow.cpp | 2 | ||||
| -rw-r--r-- | src/imports/calendar/qquickdayofweekrow_p.h | 2 | ||||
| -rw-r--r-- | src/imports/calendar/qquickmonthgrid.cpp | 2 | ||||
| -rw-r--r-- | src/imports/calendar/qquickmonthgrid_p.h | 2 | ||||
| -rw-r--r-- | src/imports/calendar/qquickweeknumbercolumn.cpp | 2 | ||||
| -rw-r--r-- | src/imports/calendar/qquickweeknumbercolumn_p.h | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/src/imports/calendar/calendar.pro b/src/imports/calendar/calendar.pro index 0dee3cb1..7c375139 100644 --- a/src/imports/calendar/calendar.pro +++ b/src/imports/calendar/calendar.pro @@ -3,7 +3,7 @@ TARGETPATH = Qt/labs/calendar IMPORT_VERSION = 1.0 QT += qml quick -QT_PRIVATE += core-private gui-private qml-private quick-private labstemplates-private +QT_PRIVATE += 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/qquickdayofweekrow.cpp b/src/imports/calendar/qquickdayofweekrow.cpp index 1f5e4387..8530389f 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 <QtLabsTemplates/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 b0c4ead9..7c69bba0 100644 --- a/src/imports/calendar/qquickdayofweekrow_p.h +++ b/src/imports/calendar/qquickdayofweekrow_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtLabsTemplates/private/qquickcontrol_p.h> +#include <QtQuickTemplates/private/qquickcontrol_p.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/calendar/qquickmonthgrid.cpp b/src/imports/calendar/qquickmonthgrid.cpp index c6ad3d53..084ade3c 100644 --- a/src/imports/calendar/qquickmonthgrid.cpp +++ b/src/imports/calendar/qquickmonthgrid.cpp @@ -39,7 +39,7 @@ #include <QtGui/qstylehints.h> #include <QtGui/qguiapplication.h> -#include <QtLabsTemplates/private/qquickcontrol_p_p.h> +#include <QtQuickTemplates/private/qquickcontrol_p_p.h> #include <QtQml/qqmlinfo.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/calendar/qquickmonthgrid_p.h b/src/imports/calendar/qquickmonthgrid_p.h index 93ba3900..df5f1716 100644 --- a/src/imports/calendar/qquickmonthgrid_p.h +++ b/src/imports/calendar/qquickmonthgrid_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtLabsTemplates/private/qquickcontrol_p.h> +#include <QtQuickTemplates/private/qquickcontrol_p.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/calendar/qquickweeknumbercolumn.cpp b/src/imports/calendar/qquickweeknumbercolumn.cpp index a128b500..1aac33f9 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 <QtLabsTemplates/private/qquickcontrol_p_p.h> +#include <QtQuickTemplates/private/qquickcontrol_p_p.h> #include <QtQml/qqmlinfo.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/calendar/qquickweeknumbercolumn_p.h b/src/imports/calendar/qquickweeknumbercolumn_p.h index f2e0e1cc..92606fc8 100644 --- a/src/imports/calendar/qquickweeknumbercolumn_p.h +++ b/src/imports/calendar/qquickweeknumbercolumn_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtLabsTemplates/private/qquickcontrol_p.h> +#include <QtQuickTemplates/private/qquickcontrol_p.h> QT_BEGIN_NAMESPACE |