diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-09-30 17:06:27 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-10-01 09:03:34 +0000 |
| commit | 98e7b3cca484df43838fe834dcaf1f97f45c659f (patch) | |
| tree | e82c39559cd26e98382964d18651b5f62cfdfae7 /examples | |
| parent | 542dd7b77a236fef03e5569e44669fad6db0485d (diff) | |
Rename QtQuick.Calendar 2.0 to Qt.labs.calendar 1.0
Change-Id: Ief7e28f6c595cb60f15a4960dada24a6c2f5ca3e
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/examples.pro | 1 | ||||
| -rw-r--r-- | examples/labs/calendar/DateTimePicker.qml (renamed from examples/quick/calendar/DateTimePicker.qml) | 2 | ||||
| -rw-r--r-- | examples/labs/calendar/EventView.qml (renamed from examples/quick/calendar/EventView.qml) | 0 | ||||
| -rw-r--r-- | examples/labs/calendar/TumblerDelegate.qml (renamed from examples/quick/calendar/TumblerDelegate.qml) | 0 | ||||
| -rw-r--r-- | examples/labs/calendar/calendar.pro (renamed from examples/quick/calendar/calendar.pro) | 0 | ||||
| -rw-r--r-- | examples/labs/calendar/calendar.qrc (renamed from examples/quick/calendar/calendar.qrc) | 0 | ||||
| -rw-r--r-- | examples/labs/calendar/main.cpp (renamed from examples/quick/calendar/main.cpp) | 0 | ||||
| -rw-r--r-- | examples/labs/calendar/main.qml (renamed from examples/quick/calendar/main.qml) | 4 | ||||
| -rw-r--r-- | examples/labs/labs.pro | 3 | ||||
| -rw-r--r-- | examples/quick/quick.pro | 1 |
10 files changed, 7 insertions, 4 deletions
diff --git a/examples/examples.pro b/examples/examples.pro index 9d95812f..e0f52889 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,3 +1,4 @@ TEMPLATE = subdirs SUBDIRS += \ + labs \ quick diff --git a/examples/quick/calendar/DateTimePicker.qml b/examples/labs/calendar/DateTimePicker.qml index 21519856..96da4175 100644 --- a/examples/quick/calendar/DateTimePicker.qml +++ b/examples/labs/calendar/DateTimePicker.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Calendar 2.0 +import Qt.labs.calendar 1.0 import QtQuick.Controls 2.0 import QtQuick.Templates 2.0 as T diff --git a/examples/quick/calendar/EventView.qml b/examples/labs/calendar/EventView.qml index 3991e5eb..3991e5eb 100644 --- a/examples/quick/calendar/EventView.qml +++ b/examples/labs/calendar/EventView.qml diff --git a/examples/quick/calendar/TumblerDelegate.qml b/examples/labs/calendar/TumblerDelegate.qml index e9c7a143..e9c7a143 100644 --- a/examples/quick/calendar/TumblerDelegate.qml +++ b/examples/labs/calendar/TumblerDelegate.qml diff --git a/examples/quick/calendar/calendar.pro b/examples/labs/calendar/calendar.pro index 105e7fc9..105e7fc9 100644 --- a/examples/quick/calendar/calendar.pro +++ b/examples/labs/calendar/calendar.pro diff --git a/examples/quick/calendar/calendar.qrc b/examples/labs/calendar/calendar.qrc index d0f67b26..d0f67b26 100644 --- a/examples/quick/calendar/calendar.qrc +++ b/examples/labs/calendar/calendar.qrc diff --git a/examples/quick/calendar/main.cpp b/examples/labs/calendar/main.cpp index 651a51ec..651a51ec 100644 --- a/examples/quick/calendar/main.cpp +++ b/examples/labs/calendar/main.cpp diff --git a/examples/quick/calendar/main.qml b/examples/labs/calendar/main.qml index 4bddf2a4..ca23b166 100644 --- a/examples/quick/calendar/main.qml +++ b/examples/labs/calendar/main.qml @@ -40,7 +40,7 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 -import QtQuick.Calendar 2.0 +import Qt.labs.calendar 1.0 import QtQuick.Templates 2.0 as T import QtQuick.Layouts 1.0 import io.qt.examples.calendar 1.0 @@ -53,7 +53,7 @@ ApplicationWindow { minimumHeight: 300 color: "#f4f4f4" visible: true - title: "Qt Quick Controls - Calendar Example" + title: "Qt Labs Calendar - Example" SqlEventModel { id: eventModel diff --git a/examples/labs/labs.pro b/examples/labs/labs.pro new file mode 100644 index 00000000..88683726 --- /dev/null +++ b/examples/labs/labs.pro @@ -0,0 +1,3 @@ +TEMPLATE = subdirs +SUBDIRS += \ + calendar diff --git a/examples/quick/quick.pro b/examples/quick/quick.pro index 80f94e86..ab3cd2b2 100644 --- a/examples/quick/quick.pro +++ b/examples/quick/quick.pro @@ -1,4 +1,3 @@ TEMPLATE = subdirs SUBDIRS += \ - calendar \ controls |