Move to importing QtQuick 2.4 & friends
This means we obviously require Qt 5.4 or greater, we had for a while
but make it official now
commitebf3a8917b3aee7d0ad66a940f179feefe3fff61
authorAlbert Astals Cid <albert.astals@canonical.com>
dateWed 15 Jul 2015, 17:07 (11 years ago)
parent4f6f48c
327 files changed+386−410
CMakeLists.txt+7−7
@@ -48,13 +48,13 @@ add_custom_target(cppcheck COMMAND cppcheck --enable=all -q --error-exitcode=2
4848 ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests)
4949
5050include(FindPkgConfig)
51−find_package(Qt5Core 5.2 REQUIRED)
52−find_package(Qt5Qml 5.2 REQUIRED)
53−find_package(Qt5Quick 5.2 REQUIRED)
54−find_package(Qt5Gui 5.2 REQUIRED)
55−find_package(Qt5DBus 5.2 REQUIRED)
56−find_package(Qt5Concurrent 5.2 REQUIRED)
57−find_package(Qt5Sql 5.2 REQUIRED)
51+find_package(Qt5Core 5.4 REQUIRED)
52+find_package(Qt5Qml 5.4 REQUIRED)
53+find_package(Qt5Quick 5.4 REQUIRED)
54+find_package(Qt5Gui 5.4 REQUIRED)
55+find_package(Qt5DBus 5.4 REQUIRED)
56+find_package(Qt5Concurrent 5.4 REQUIRED)
57+find_package(Qt5Sql 5.4 REQUIRED)
5858
5959pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=6)
6060
debian/control+4−4
@@ -43,12 +43,12 @@ Build-Depends: cmake,
4343 qml-module-qtsysteminfo,
4444 qml-module-qttest,
4545 qt5-default,
46− qtbase5-dev (>= 5.2.1),
46+ qtbase5-dev (>= 5.4),
4747 qtbase5-dev-tools,
48− qtbase5-private-dev (>= 5.2.1),
49− qtdeclarative5-dev (>= 5.2.1),
48+ qtbase5-private-dev (>= 5.4),
49+ qtdeclarative5-dev (>= 5.4),
5050 qtdeclarative5-dev-tools,
51− qtdeclarative5-private-dev (>= 5.2.1),
51+ qtdeclarative5-private-dev (>= 5.4),
5252 qtdeclarative5-qtmultimedia-plugin,
5353 qtdeclarative5-ubuntu-settings-components (>= 0.6),
5454 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1.1239) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1239),
plugins/Dash/CardAttributes.qml+2−2
@@ -14,8 +14,8 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.2
18−import QtQuick.Layouts 1.1
17+import QtQuick 2.4
18+import QtQuick.Layouts 1.2
1919import Ubuntu.Components 1.3
2020
2121GridLayout {
plugins/Dash/CardCreator.js+1−1
@@ -697,7 +697,7 @@ function cardString(template, components) {
697697}
698698
699699function createCardComponent(parent, template, components) {
700− var imports = 'import QtQuick 2.2; \n\
700+ var imports = 'import QtQuick 2.4; \n\
701701 import Ubuntu.Components 1.3; \n\
702702 import Ubuntu.Settings.Components 0.1; \n\
703703 import Dash 0.1;\n\
plugins/Dash/CardCreatorCache.qml+1−1
@@ -15,7 +15,7 @@
1515 */
1616
1717pragma Singleton
18−import QtQuick 2.2
18+import QtQuick 2.4
1919import "CardCreator.js" as CardCreator
2020
2121QtObject {
plugins/Dash/CroppedImageMinimumSourceSize.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818import Dash 0.1
1919
2020Item {
plugins/Dash/ScopeStyle.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.2
17+import QtQuick 2.4
1818import Utils 0.1
1919import Ubuntu.Components 1.3
2020
plugins/Dash/abstractdashview.h−4
@@ -109,11 +109,7 @@ private:
109109 virtual void doRelayout() = 0;
110110 virtual void updateItemCulling(qreal visibleFromY, qreal visibleToY) = 0;
111111 virtual void calculateImplicitHeight() = 0;
112−#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))
113− virtual void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) = 0;
114−#else
115112 virtual void processModelRemoves(const QVector<QQmlChangeSet::Change> &removes) = 0;
116−#endif
117113
118114 QQmlDelegateModel *m_delegateModel;
119115
plugins/Dash/horizontaljournal.cpp−4
@@ -184,11 +184,7 @@ void HorizontalJournal::calculateImplicitHeight()
184184 }
185185}
186186
187−#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))
188−void HorizontalJournal::processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes)
189−#else
190187void HorizontalJournal::processModelRemoves(const QVector<QQmlChangeSet::Change> &removes)
191−#endif
192188{
193189 Q_FOREACH(const QQmlChangeSet::Change &remove, removes) {
194190 for (int i = remove.count - 1; i >= 0; --i) {
plugins/Dash/horizontaljournal.h−4
@@ -52,11 +52,7 @@ private:
5252 void calculateImplicitHeight() override;
5353 void doRelayout() override;
5454 void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;
55−#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))
56− void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) override;
57−#else
5855 void processModelRemoves(const QVector<QQmlChangeSet::Change> &removes) override;
59−#endif
6056
6157 int m_firstVisibleIndex;
6258 QList<QQuickItem*> m_visibleItems;
plugins/Dash/organicgrid.cpp−4
@@ -237,11 +237,7 @@ void OrganicGrid::calculateImplicitHeight()
237237 }
238238}
239239
240−#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))
241−void OrganicGrid::processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes)
242−#else
243240void OrganicGrid::processModelRemoves(const QVector<QQmlChangeSet::Change> &removes)
244−#endif
245241{
246242 Q_FOREACH(const QQmlChangeSet::Change &remove, removes) {
247243 for (int i = remove.count - 1; i >= 0; --i) {
plugins/Dash/organicgrid.h−4
@@ -79,11 +79,7 @@ private:
7979 void doRelayout() override;
8080 void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;
8181 void calculateImplicitHeight() override;
82−#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))
83− void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) override;
84−#else
8582 void processModelRemoves(const QVector<QQmlChangeSet::Change> &removes) override;
86−#endif
8783
8884 QSizeF m_smallDelegateSize;
8985 QSizeF m_bigDelegateSize;
plugins/Dash/verticaljournal.cpp−4
@@ -239,11 +239,7 @@ void VerticalJournal::updateItemCulling(qreal visibleFromY, qreal visibleToY)
239239 }
240240}
241241
242−#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))
243−void VerticalJournal::processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes)
244−#else
245242void VerticalJournal::processModelRemoves(const QVector<QQmlChangeSet::Change> &removes)
246−#endif
247243{
248244 Q_FOREACH(const QQmlChangeSet::Change &remove, removes) {
249245 for (int i = remove.count - 1; i >= 0; --i) {
plugins/Dash/verticaljournal.h−4
@@ -90,11 +90,7 @@ private:
9090 void calculateImplicitHeight() override;
9191 void doRelayout() override;
9292 void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;
93−#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))
94− void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) override;
95−#else
9693 void processModelRemoves(const QVector<QQmlChangeSet::Change> &removes) override;
97−#endif
9894
9995 QVector<QList<ViewItem>> m_columnVisibleItems;
10096 QHash<int, int> m_indexColumnMap;
qml/Components/Background.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Utils 0.1 as Utils
2020
qml/Components/BaseCarouselDelegate.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919
2020/*!
qml/Components/Carousel.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import "carousel.js" as CarouselJS
2020
qml/Components/Circle.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818
1919Rectangle {
2020 antialiasing: true
qml/Components/DelayedLockscreen.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import "../Components"
2020
qml/Components/Dialogs.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818
1919import Unity.Application 0.1
2020import Unity.Session 0.1
qml/Components/DragHandle.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Ubuntu.Gestures 0.1
2020
qml/Components/DraggingArea.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919
2020MouseArea {
qml/Components/EdgeDragEvaluator.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Ubuntu.Gestures 0.1
2020
qml/Components/InputMethod.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Unity.Application 0.1
1919import Ubuntu.Components 1.3
2020import Ubuntu.Gestures 0.1
qml/Components/LazyImage.qml+1−1
@@ -17,7 +17,7 @@
1717 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1818 */
1919
20−import QtQuick 2.0
20+import QtQuick 2.4
2121import Ubuntu.Components 1.3
2222
2323Item {
qml/Components/ListItems/Header.qml+2−2
@@ -14,8 +14,8 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
18−import QtQuick.Layouts 1.1
17+import QtQuick 2.4
18+import QtQuick.Layouts 1.2
1919import Ubuntu.Components 1.3
2020
2121Item {
qml/Components/ListItems/ThinDivider.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818
1919Image {
2020 anchors {
qml/Components/Lockscreen.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Ubuntu.Components.Popups 1.3
2020import Ubuntu.Telephony 0.1 as Telephony
qml/Components/PanelState/PanelState.qml+1−1
@@ -15,7 +15,7 @@
1515 */
1616
1717pragma Singleton
18−import QtQuick 2.0
18+import QtQuick 2.4
1919
2020QtObject {
2121 id: root
qml/Components/PassphraseLockscreen.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import "../Components"
2020
qml/Components/PhysicalKeysMapper.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Powerd 0.1
1919
2020/*!
qml/Components/PinLockscreen.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Ubuntu.Components.ListItems 1.3
2020import "../Components"
qml/Components/PinPadButton.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919
2020AbstractButton {
qml/Components/Rating.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919
2020/*! Rating widget bar. */
qml/Components/RatingStyle.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919
2020Row {
qml/Components/ResponsiveGridView.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919
2020/*
qml/Components/ResponsiveVerticalJournal.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import "../Components"
2020import Dash 0.1
qml/Components/ScreenGrabber.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtMultimedia 5.0
1919import ScreenGrabber 0.1
2020
qml/Components/ScrollCalculator.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.2
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919
2020Item {
qml/Components/SearchHistoryModel/SearchHistoryModel.qml+1−1
@@ -15,7 +15,7 @@
1515 */
1616
1717pragma Singleton
18−import QtQuick 2.0
18+import QtQuick 2.4
1919
2020// TODO sanitize input, move to persistent storage
2121
qml/Components/ShellDialog.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818
1919import Ubuntu.Components 1.3
2020import Ubuntu.Components.Popups 1.3
qml/Components/Showable.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818
1919Item {
2020 id: showable
qml/Components/StandardAnimation.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818
1919NumberAnimation {
2020 duration: 200
qml/Components/UbuntuShapeForItem.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919
2020/* FIXME: This component is duplicating the UbuntuShape from the SDK, but shapes more
qml/Components/UnityInputInfo/UnityInputInfo.qml+1−1
@@ -16,7 +16,7 @@
1616
1717pragma Singleton
1818
19−import QtQuick 2.3
19+import QtQuick 2.4
2020import Unity.InputInfo 0.1
2121
2222Item {
qml/Components/VolumeControl.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QMenuModel 0.1
1919
2020Item {
qml/Components/WindowControlButtons.qml+1−1
@@ -16,7 +16,7 @@
1616 * Authors: Michael Zanetti <michael.zanetti@canonical.com>
1717 */
1818
19−import QtQuick 2.3
19+import QtQuick 2.4
2020import Ubuntu.Components 1.3
2121
2222Row {
qml/Components/WindowScreenshot.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.2
17+import QtQuick 2.4
1818
1919Item {
2020 id: root
qml/Components/WrongPasswordAnimation.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818
1919SequentialAnimation {
2020 id: root
qml/Components/ZoomableImage.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import "../Components"
2020
qml/Dash/CardCarousel.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import "../Components"
2020
qml/Dash/CardGrid.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import "../Components"
1919
2020DashRenderer {
qml/Dash/CardHorizontalList.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import "../Components"
2020
qml/Dash/CardTool.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Dash 0.1
1919
2020/*!
qml/Dash/CardVerticalJournal.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import "../Components"
2020
qml/Dash/Dash.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.2
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Ubuntu.Gestures 0.1
2020import Unity 0.2
qml/Dash/DashApplication.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.2
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Ubuntu.Thumbnailer 0.1 // Register support for image://thumbnailer/ and image://albumart/
2020
qml/Dash/DashBackground.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818
1919Image {
2020 source: anchors.fill.width > anchors.fill.height ? "graphics/paper_landscape.png" : "graphics/paper_portrait.png"
qml/Dash/DashCategoryBase.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919
2020Item {
qml/Dash/DashContent.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Unity 0.2
2020import Utils 0.1
qml/Dash/DashNavigation.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.2
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Dash 0.1
2020import "../Components"
qml/Dash/DashNavigationButton.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.2
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919
2020AbstractButton {
qml/Dash/DashNavigationList.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.2
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import "../Components"
2020
qml/Dash/DashRenderer.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818
1919Item {
2020 property real collapsedHeight
qml/Dash/GenericScopeView.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Utils 0.1
2020import Unity 0.2
qml/Dash/PageHeader.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.2
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Ubuntu.Components.Themes.Ambiance 1.3
2020import Ubuntu.Components.Popups 1.3
qml/Dash/PreviewListView.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Unity 0.2
2020import "../Components"
qml/Dash/Previews/Preview.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919
2020/*! \brief This component constructs the Preview UI.
qml/Dash/Previews/PreviewActionButton.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919
2020Button {
qml/Dash/Previews/PreviewActionCombo.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919
2020Item {
qml/Dash/Previews/PreviewActions.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.1
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919
2020/*! This preview widget shows either one button, two buttons or one button
qml/Dash/Previews/PreviewAudioPlayback.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtMultimedia 5.0
1919import Ubuntu.Components 1.3
2020
qml/Dash/Previews/PreviewExpandable.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import "../../Components"
2020
qml/Dash/Previews/PreviewHeader.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Dash 0.1
2020import "../"
qml/Dash/Previews/PreviewImageGallery.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import "../../Components"
2020
qml/Dash/Previews/PreviewOverlay.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import "../../Components"
2020
qml/Dash/Previews/PreviewPayments.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.1
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Ubuntu.Payments 0.1
2020
qml/Dash/Previews/PreviewProgress.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.1
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Ubuntu.DownloadDaemonListener 0.1
2020
qml/Dash/Previews/PreviewRatingDisplay.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import "../../Components"
2020
qml/Dash/Previews/PreviewRatingInput.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import "../../Components"
2020
qml/Dash/Previews/PreviewTable.qml+2−2
@@ -14,8 +14,8 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
18−import QtQuick.Layouts 1.1
17+import QtQuick 2.4
18+import QtQuick.Layouts 1.2
1919import Ubuntu.Components 1.3
2020import "../../Components"
2121
qml/Dash/Previews/PreviewTextSummary.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import "../../Components"
2020
qml/Dash/Previews/PreviewVideoPlayback.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Ubuntu.Thumbnailer 0.1
2020import "../../Components"
qml/Dash/Previews/PreviewWidget.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818
1919/*! Interface for preview widgets. */
2020
qml/Dash/Previews/PreviewWidgetFactory.qml+1−1
@@ -15,7 +15,7 @@
1515 *
1616 */
1717
18−import QtQuick 2.0
18+import QtQuick 2.4
1919
2020//! \brief This component loads the widgets based on widgetData["type"].
2121
qml/Dash/Previews/PreviewZoomableImage.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import "../../Components"
2020
qml/Dash/PullToRefreshScopeStyle.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Ubuntu.Components.Styles 1.3
2020
qml/Dash/ScopeListView.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Dash 0.1
1919
2020ListViewWithPageHeader {
qml/Dash/ScopeSettings/ScopeSetting.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.2
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919
2020/*! Interface for settings widgets. */
qml/Dash/ScopeSettings/ScopeSettingBoolean.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.2
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Ubuntu.Components.ListItems 1.3 as ListItem
2020
qml/Dash/ScopeSettings/ScopeSettingList.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.2
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Ubuntu.Components.ListItems 1.3 as ListItem
2020
qml/Dash/ScopeSettings/ScopeSettingNumber.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.2
17+import QtQuick 2.4
1818
1919ScopeSettingString {
2020 mode: "number"
qml/Dash/ScopeSettings/ScopeSettingString.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.2
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Ubuntu.Components.ListItems 1.3 as ListItem
2020
qml/Dash/ScopeSettings/ScopeSettingsWidgetFactory.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.2
17+import QtQuick 2.4
1818
1919//! \brief This component loads the widgets based on type.
2020
qml/Dash/ScopeSettingsPage.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.2
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Unity 0.2
2020import "../Components"
qml/Dash/ScopesList.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818import Dash 0.1
1919
2020Item {
qml/Dash/ScopesListCategory.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Dash 0.1
2020import "../Components/ListItems" as ListItems
qml/Dash/ScopesListCategoryItem.qml+2−2
@@ -14,8 +14,8 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
18−import QtQuick.Layouts 1.1
17+import QtQuick 2.4
18+import QtQuick.Layouts 1.2
1919import Ubuntu.Components 1.3
2020
2121MouseArea {
qml/DeviceConfiguration.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818
1919StateGroup {
2020 id: root
qml/Greeter/Clock.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import "../Panel/Indicators"
2020import Unity.Indicators 0.1 as Indicators
qml/Greeter/CoverPage.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Ubuntu.Gestures 0.1
2020import "../Components"
qml/Greeter/Dot.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818
1919Image {
2020 states: [
qml/Greeter/Greeter.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818import AccountsService 0.1
1919import LightDM 0.1 as LightDM
2020import Ubuntu.Components 1.3
qml/Greeter/Infographics.qml+1−1
@@ -16,7 +16,7 @@
1616
1717import "../Components"
1818import "Gradient.js" as Gradient
19−import QtQuick 2.0
19+import QtQuick 2.4
2020import Ubuntu.Components 1.3
2121
2222Item {
qml/Greeter/LoginList.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import "../Components"
2020
qml/Greeter/NarrowView.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import "../Components"
2020
qml/Greeter/ObjectPositioner.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919
2020Item {
qml/Greeter/ShimGreeter.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818
1919/*
2020 * This is a shim greeter that is only used to provide a shell,
qml/Greeter/WideView.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919
2020FocusScope {
qml/Launcher/FoldingLauncherDelegate.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919
2020LauncherDelegate {
qml/Launcher/Launcher.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import "../Components"
1919import Ubuntu.Components 1.3
2020import Ubuntu.Gestures 0.1
qml/Launcher/LauncherDelegate.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919
2020Item {
qml/Launcher/LauncherPanel.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Ubuntu.Components.ListItems 1.3 as ListItems
2020import Unity.Launcher 0.1
qml/Notifications/Notification.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtMultimedia 5.0
1919import Ubuntu.Components 1.3
2020import Unity.Notifications 1.0
qml/Notifications/NotificationMenuItemFactory.qml+1−1
@@ -17,7 +17,7 @@
1717 * Nick Dedekind <nick.dedekind@canonical.com>
1818 */
1919
20−import QtQuick 2.0
20+import QtQuick 2.4
2121import Ubuntu.Components 1.3
2222import QMenuModel 0.1
2323import "../Components"
qml/Notifications/Notifications.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Unity.Notifications 1.0 as UnityNotifications
2020import Utils 0.1
qml/Notifications/OptionToggle.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Ubuntu.Components.ListItems 1.3 as ListItem
2020import Ubuntu.Components.Popups 1.3
qml/Notifications/ShapedIcon.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919
2020Item {
qml/Notifications/SwipeToAct.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919
2020Item {
qml/OrientedShell.qml+2−2
@@ -14,8 +14,8 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
18−import QtQuick.Window 2.0
17+import QtQuick 2.4
18+import QtQuick.Window 2.2
1919import Unity.Session 0.1
2020import GSettings 1.0
2121import "Components"
qml/Panel/ActiveCallHint.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Telephony 0.1 as Telephony
1919import Ubuntu.Components 1.3
2020import Unity.Application 0.1
qml/Panel/Handle.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.2
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919
2020Rectangle {
qml/Panel/IndicatorItem.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.2
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Ubuntu.Settings.Components 0.1
2020import "Indicators"
qml/Panel/IndicatorItemRow.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.2
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919
2020Item {
qml/Panel/IndicatorPage.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3 as Components
1919import Unity.Indicators 0.1 as Indicators
2020import "Indicators"
qml/Panel/Indicators/IndicatorBase.qml+1−1
@@ -17,7 +17,7 @@
1717 * Nick Dedekind <nick.dedekind@canonical.com>
1818 */
1919
20−import QtQuick 2.0
20+import QtQuick 2.4
2121import Unity.Indicators 0.1
2222
2323Item {
qml/Panel/Indicators/IndicatorDelegate.qml+1−1
@@ -17,7 +17,7 @@
1717 * Nick Dedekind <nick.dedekind@canonical.com>
1818 */
1919
20−import QtQuick 2.0
20+import QtQuick 2.4
2121
2222IndicatorBase {
2323 readonly property bool indicatorVisible: rootActionState.indicatorVisible
qml/Panel/Indicators/IndicatorsLight.qml+1−1
@@ -17,7 +17,7 @@
1717 * Renato Araujo Oliveira Filho <renato@canonical.com>
1818 */
1919
20−import QtQuick 2.0
20+import QtQuick 2.4
2121import Powerd 0.1
2222import Lights 0.1
2323import QMenuModel 0.1 as QMenuModel
qml/Panel/Indicators/MenuItemFactory.qml+1−1
@@ -17,7 +17,7 @@
1717 * Nick Dedekind <nick.dedekind@canonical.com>
1818 */
1919
20−import QtQuick 2.0
20+import QtQuick 2.4
2121import Ubuntu.Settings.Menus 0.1 as Menus
2222import Ubuntu.Settings.Components 0.1
2323import QMenuModel 0.1
qml/Panel/Indicators/MessageMenuItemFactory.qml+1−1
@@ -18,7 +18,7 @@
1818 * Olivier Tilloy <olivier.tilloy@canonical.com>
1919 */
2020
21−import QtQuick 2.0
21+import QtQuick 2.4
2222import Ubuntu.Components 1.3
2323import Ubuntu.Settings.Menus 0.1 as Menus
2424import QMenuModel 0.1 as QMenuModel
qml/Panel/Indicators/ModemInfoItem.qml+2−2
@@ -14,8 +14,8 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
18−import QtQuick.Layouts 1.1
17+import QtQuick 2.4
18+import QtQuick.Layouts 1.2
1919import Ubuntu.Components 1.3
2020import Ubuntu.Components.ListItems 1.3 as ListItem
2121
qml/Panel/Indicators/RoamingIndication.qml+2−2
@@ -14,8 +14,8 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
18−import QtQuick.Layouts 1.1
17+import QtQuick 2.4
18+import QtQuick.Layouts 1.2
1919import Ubuntu.Components 1.3
2020
2121RowLayout {
qml/Panel/Indicators/client/IndicatorRepresentation.qml+1−1
@@ -18,7 +18,7 @@
1818 * Nick Dedekind <nick.dedekind@canonical.com>
1919 */
2020
21−import QtQuick 2.0
21+import QtQuick 2.4
2222import Ubuntu.Components 1.3
2323import Ubuntu.Components.ListItems 1.3 as ListItem
2424import "../.."
qml/Panel/Indicators/client/IndicatorsClient.qml+1−1
@@ -17,7 +17,7 @@
1717 * Renato Araujo Oliveira Filho <renato@canonical.com>
1818 */
1919
20−import QtQuick 2.0
20+import QtQuick 2.4
2121import Ubuntu.Components 1.3
2222import Ubuntu.Components.ListItems 1.3 as ListItem
2323
qml/Panel/Indicators/client/IndicatorsList.qml+1−1
@@ -17,7 +17,7 @@
1717 * Renato Araujo Oliveira Filho <renato@canonical.com>
1818 */
1919
20−import QtQuick 2.0
20+import QtQuick 2.4
2121import Ubuntu.Components 1.3
2222import Ubuntu.Components.ListItems 1.3 as ListItem
2323import Unity.Indicators 0.1 as Indicators
qml/Panel/Indicators/client/IndicatorsTree.qml+1−1
@@ -17,7 +17,7 @@
1717 * Nick Dedekind <nick.dededkind@canonical.com>
1818 */
1919
20−import QtQuick 2.0
20+import QtQuick 2.4
2121import Ubuntu.Components 1.3
2222import Unity.Indicators 0.1 as Indicators
2323import ".."
qml/Panel/IndicatorsBar.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.2
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import "../Components"
2020
qml/Panel/IndicatorsMenu.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.2
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Ubuntu.Gestures 0.1
2020import "../Components"
qml/Panel/MenuContent.qml+2−2
@@ -14,8 +14,8 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.2
18−import QtQuick.Layouts 1.1
17+import QtQuick 2.4
18+import QtQuick.Layouts 1.2
1919import Ubuntu.Components 1.3
2020import Unity.Indicators 0.1 as Indicators
2121import Utils 0.1
qml/Panel/Panel.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.2
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Unity.Application 0.1
2020import "../Components"
qml/Panel/PanelBackground.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818
1919Rectangle {
2020 color: "black"
qml/Panel/PanelSeparatorLine.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818
1919Rectangle {
2020 property real saturation: 1.0
qml/Panel/PanelVelocityCalculator.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.2
17+import QtQuick 2.4
1818import Ubuntu.Gestures 0.1
1919
2020Item {
qml/Rotation/HalfLoopRotationAnimation.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818
1919SequentialAnimation {
2020 id: root
qml/Rotation/ImmediateRotationAction.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818
1919ScriptAction {
2020 property var info
qml/Rotation/NinetyRotationAnimation.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818
1919SequentialAnimation {
2020 id: root
qml/Rotation/RotationStates.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Powerd 0.1
2020
qml/ScopeTool.qml+1−1
@@ -14,7 +14,7 @@
1414* along with this program. If not, see <http://www.gnu.org/licenses/>.
1515*/
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Ubuntu.Components.Popups 1.3
2020import Ubuntu.Thumbnailer 0.1 // Register support for image://thumbnailer/ and image://albumart/
qml/Shell.qml+2−2
@@ -14,8 +14,8 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
18−import QtQuick.Window 2.0
17+import QtQuick 2.4
18+import QtQuick.Window 2.2
1919import AccountsService 0.1
2020import GSettings 1.0
2121import Unity.Application 0.1
qml/Stages/Animations/BaseSessionAnimation.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818
1919/* This is the base case for surface animations, used when adding/removing * child surfaces.
2020 * The class is meant to be overridden and changes/animations provided for state changes.
qml/Stages/Animations/SwipeFromBottomAnimation.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919
2020BaseSessionAnimation {
qml/Stages/ApplicationWindow.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Unity.Application 0.1
2020
qml/Stages/DecoratedWindow.qml+1−1
@@ -16,7 +16,7 @@
1616 * Authors: Michael Zanetti <michael.zanetti@canonical.com>
1717 */
1818
19−import QtQuick 2.3
19+import QtQuick 2.4
2020import Ubuntu.Components 1.3
2121import Unity.Application 0.1
2222
qml/Stages/DesktopStage.qml+1−1
@@ -16,7 +16,7 @@
1616 * Authors: Michael Zanetti <michael.zanetti@canonical.com>
1717 */
1818
19−import QtQuick 2.3
19+import QtQuick 2.4
2020import Ubuntu.Components 1.3
2121import Unity.Application 0.1
2222import "../Components/PanelState"
qml/Stages/MainViewStyle.qml+1−1
@@ -13,7 +13,7 @@
1313 * You should have received a copy of the GNU Lesser General Public License
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
16−import QtQuick 2.0
16+import QtQuick 2.4
1717import Ubuntu.Components 1.3
1818
1919// FIXME: copied with slight modifications from Ubuntu UI Toolkit's Ambiance's theme
qml/Stages/OrientationChangeAnimation.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818
1919QtObject {
2020 id: root
qml/Stages/PageHeadStyle.qml+1−1
@@ -13,7 +13,7 @@
1313 * You should have received a copy of the GNU Lesser General Public License
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
16−import QtQuick 2.2
16+import QtQuick 2.4
1717import Ubuntu.Components 1.3
1818import Ubuntu.Components.Styles 1.3 as Style
1919
qml/Stages/PhoneStage.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.2
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Ubuntu.Gestures 0.1
2020import Unity.Application 0.1
qml/Stages/SessionContainer.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515*/
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import "Animations"
1919
2020FocusScope {
qml/Stages/ShimStage.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919
2020Rectangle {
qml/Stages/Splash.qml+2−2
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515*/
1616
17−import QtQuick 2.2
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Ubuntu.Components.Themes 1.3
2020import "../Components"
@@ -64,7 +64,7 @@ Item {
6464 // FIXME: fake a Theme object as to expose the Palette corresponding to the backgroundColor (see MainViewStyle.qml)
6565 readonly property var fakeTheme: QtObject {
6666 property string name
67− property Palette palette: Qt.createQmlObject("import QtQuick 2.2;\
67+ property Palette palette: Qt.createQmlObject("import QtQuick 2.4;\
6868 import Ubuntu.Components.Themes.%1 1.3;\
6969 Palette {}".arg(styledItem.fakeTheme.name),
7070 styledItem, "dynamicPalette");
qml/Stages/SpreadDelegate.qml+2−2
@@ -17,8 +17,8 @@
1717 * Daniel d'Andrada <daniel.dandrada@canonical.com>
1818 */
1919
20−import QtQuick 2.0
21−import QtQuick.Window 2.0
20+import QtQuick 2.4
21+import QtQuick.Window 2.2
2222import Ubuntu.Components 1.3
2323import "../Components"
2424
qml/Stages/SurfaceContainer.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515*/
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Ubuntu.Gestures 0.1 // For TouchGate
2020import Utils 0.1 // for InputWatcher
qml/Stages/TabletStage.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Ubuntu.Gestures 0.1
2020import Unity.Application 0.1
qml/Stages/TransformedSpreadDelegate.qml+1−1
@@ -16,7 +16,7 @@
1616 * Authors: Michael Zanetti <michael.zanetti@canonical.com>
1717*/
1818
19−import QtQuick 2.0
19+import QtQuick 2.4
2020import Utils 0.1
2121import Ubuntu.Components 1.3
2222
qml/Stages/TransformedTabletSpreadDelegate.qml+1−1
@@ -16,7 +16,7 @@
1616 * Authors: Michael Zanetti <michael.zanetti@canonical.com>
1717*/
1818
19−import QtQuick 2.0
19+import QtQuick 2.4
2020import Utils 0.1
2121import Ubuntu.Components 1.3
2222import Unity.Application 0.1
qml/Stages/WindowDecoration.qml+1−1
@@ -16,7 +16,7 @@
1616 * Authors: Michael Zanetti <michael.zanetti@canonical.com>
1717 */
1818
19−import QtQuick 2.3
19+import QtQuick 2.4
2020import Ubuntu.Components 1.3
2121import "../Components"
2222
qml/Stages/WindowMoveResizeArea.qml+1−1
@@ -16,7 +16,7 @@
1616 * Authors: Michael Zanetti <michael.zanetti@canonical.com>
1717 */
1818
19−import QtQuick 2.3
19+import QtQuick 2.4
2020import Ubuntu.Components 1.3
2121import Utils 0.1
2222
qml/Tutorial/Arrow.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919
2020Item {
qml/Tutorial/Slider.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919
2020Item {
qml/Tutorial/Tick.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919
2020MouseArea {
qml/Tutorial/Tutorial.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919
2020Item {
qml/Tutorial/TutorialBottom.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Ubuntu.Gestures 0.1
2020import "../Components"
qml/Tutorial/TutorialBottomFinish.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import "." as LocalComponents
2020
qml/Tutorial/TutorialContent.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919
2020Item {
qml/Tutorial/TutorialLeft.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import "." as LocalComponents
2020
qml/Tutorial/TutorialLeftFinish.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import "." as LocalComponents
2020
qml/Tutorial/TutorialPage.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import "../Components"
2020
qml/Tutorial/TutorialRight.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Ubuntu.Gestures 0.1
2020import Unity.Application 0.1
qml/Wizard/CheckableSetting.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Ubuntu.Components.ListItems 1.3 as ListItem
2020
qml/Wizard/Page.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919
2020Item {
qml/Wizard/Pages.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Ubuntu.SystemSettings.SecurityPrivacy 1.0
2020import Wizard 0.1
qml/Wizard/Pages/10-welcome.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Ubuntu.Components.ListItems 1.3
2020import Ubuntu.SystemSettings.LanguagePlugin 1.0
qml/Wizard/Pages/20-sim.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import MeeGo.QOfono 0.2
1919import Ubuntu.Components 1.3
2020import ".." as LocalComponents
qml/Wizard/Pages/30-passwd-type.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Ubuntu.Components.ListItems 1.3
2020import Ubuntu.SystemSettings.SecurityPrivacy 1.0
qml/Wizard/Pages/40-wifi.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QMenuModel 0.1 as QMenuModel
1919import QtSystemInfo 5.0
2020import Ubuntu.Components 1.3
qml/Wizard/Pages/50-location.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818import AccountsService 0.1
1919import QMenuModel 0.1 as QMenuModel
2020import Qt.labs.folderlistmodel 2.1
qml/Wizard/Pages/60-reporting.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import ".." as LocalComponents
2020
qml/Wizard/Pages/80-finished.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import ".." as LocalComponents
2020
qml/Wizard/Pages/here-terms.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818import AccountsService 0.1
1919import Qt.labs.folderlistmodel 2.1
2020import Ubuntu.Components 1.3
qml/Wizard/Pages/passwd-confirm.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Ubuntu.SystemSettings.SecurityPrivacy 1.0
2020import ".." as LocalComponents
qml/Wizard/Pages/passwd-set.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Ubuntu.SystemSettings.SecurityPrivacy 1.0
2020import ".." as LocalComponents
qml/Wizard/StackButton.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919
2020AbstractButton {
qml/Wizard/Wizard.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Wizard 0.1
2020import "../Components"
tests/CMakeLists.txt+1−1
@@ -126,4 +126,4 @@ add_subdirectory(libs)
126126add_subdirectory(plugins)
127127add_subdirectory(qmltests)
128128add_subdirectory(whitespace)
129−add_subdirectory(sdk)
129+add_subdirectory(imports)
tests/imports/CMakeLists.txtnew file+5
@@ -0,0 +1,5 @@
1+
2+#
3+# Test that all imports for QtQuick and Ubuntu.Components use the wanted version
4+#
5+add_test(imports ${CMAKE_CURRENT_SOURCE_DIR}/check_imports.py ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
tests/sdk/check_sdk.py → tests/imports/check_imports.pyrenamed+29−18
@@ -15,14 +15,12 @@
1515# You should have received a copy of the GNU General Public License
1616# along with this program. If not, see <http://www.gnu.org/licenses/>.
1717#
18−# Authored by: Michi Henning <michi.henning@canonical.com>
19−#
2018
2119#
2220# Little helper program to test that all source files import
23−# the wanted SDK version
21+# versions we want
2422#
25−# Usage: check_sdk.py directory [ignore_prefix]
23+# Usage: check_imports.py directory [ignore_prefix]
2624#
2725# The directory specifies the (recursive) location of the source files. Any
2826# files with a path that starts with ignore_prefix are not checked. This is
@@ -48,35 +46,45 @@ def error(msg):
4846def raise_error(e):
4947 raise e
5048
51−# Scan lines in file_path for bad SDK version. For each file,
52−# print the line numbers that have SDK version issues
49+# Qt Quick patterns
50+# If you increase this make sure you increase
51+# the Qt version in debian/control and in CMakeLists.txt
52+quick_pat = re.compile(r'.*import QtQuick.*$')
53+quick_good_pat = re.compile(r'.*import QtQuick 2\.4.*$')
54+quick_layouts_good_pat = re.compile(r'.*import QtQuick.Layouts 1\.2.*$')
55+quick_window_good_pat = re.compile(r'.*import QtQuick.Window 2\.2.*$')
5356
57+# Ubuntu Components patterns
5458ubuntu_components_pat = re.compile(r'.*import Ubuntu.Components.*')
5559ubuntu_good_components_pat = re.compile(r'.*import Ubuntu.Components.*1\.3.*')
5660
57−def scan_for_bad_sdk(file_path):
58− global ubuntu_components_pat
61+def scan_for_bad_import(file_path, all_pat, good_pats):
5962 errors = []
6063 with open(file_path, 'rt', encoding='utf-8') as ifile:
6164 for lino, line in enumerate(ifile, start=1):
62− if ubuntu_components_pat.match(line) and not ubuntu_good_components_pat.match(line):
63− errors.append(lino)
65+ if all_pat.match(line):
66+ good_found = False
67+ for good_pat in good_pats:
68+ if good_pat.match(line):
69+ good_found = True
70+ if not good_found:
71+ errors.append(lino)
6472 if 0 < len(errors) <= 10:
6573 if len(errors) > 1:
6674 plural = 's'
6775 else:
6876 plural = ''
6977 print(
70− "%s: bad SDK Version in line%s %s" % (
78+ "%s: bad import version in line%s %s" % (
7179 file_path, plural, ", ".join((str(i) for i in errors))))
7280 elif errors:
73− print("%s: bad SDK Version in multiple lines" % file_path)
81+ print("%s: bad import version in multiple lines" % file_path)
7482 return bool(errors)
7583
7684# Parse args
7785
7886parser = argparse.ArgumentParser(
79− description='Test that source files contain the wanted SDK version.')
87+ description='Test that source files contain the wanted import version.')
8088parser.add_argument(
8189 'dir', nargs=1,
8290 help='The directory to (recursively) search for source files')
@@ -85,7 +93,7 @@ parser.add_argument(
8593 help='Ignore source files with a path that starts with the given prefix.')
8694args = parser.parse_args()
8795
88−# Files we want to check for SDK version.
96+# Files we want to check for import version.
8997
9098file_pat = (
9199 r'(.*\.(js|qml)$)')
@@ -97,18 +105,21 @@ pat = re.compile(file_pat)
97105directory = os.path.abspath(args.dir[0])
98106ignore = args.ignore_prefix and os.path.abspath(args.ignore_prefix) or None
99107
100−found_bad_sdk = False
108+found_bad_import = False
101109try:
102110 for root, dirs, files in os.walk(directory, onerror=raise_error):
103111 for file in files:
104112 path = os.path.join(root, file)
105113 if not (ignore and path.startswith(ignore)) and pat.match(file):
106− if scan_for_bad_sdk(path):
107− found_bad_sdk = True
114+ quick_good_pats = [quick_good_pat, quick_layouts_good_pat, quick_window_good_pat]
115+ if scan_for_bad_import(path, quick_pat, quick_good_pats):
116+ found_bad_import = True
117+ if scan_for_bad_import(path, ubuntu_components_pat, [ubuntu_good_components_pat]):
118+ found_bad_import = True
108119
109120except OSError as e:
110121 error("cannot create file list for \"" + dir + "\": " + e.strerror)
111122 sys.exit(1)
112123
113−if found_bad_sdk:
124+if found_bad_import:
114125 sys.exit(1)
tests/mocks/MeeGo/QOfono/MockOfonoSimManager.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818import MeeGo.QOfono 0.2
1919
2020Item {
tests/mocks/QMenuModel/QDBusActionGroup.qml+2−2
@@ -17,7 +17,7 @@
1717 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1818 */
1919
20−import QtQuick 2.0
20+import QtQuick 2.4
2121import Ubuntu.Settings.Menus 0.1 as Menus
2222import QMenuModel 0.1
2323
@@ -34,7 +34,7 @@ QtObject {
3434
3535 function action(actionName) {
3636 return Qt.createQmlObject("
37− import QtQuick 2.3
37+ import QtQuick 2.4
3838 import QMenuModel 0.1
3939
4040 QtObject {
tests/mocks/QMenuModel/UnityMenuAction.qml+1−1
@@ -17,7 +17,7 @@
1717 * Nick Dedekind <nick.dedekind@canonical.com>
1818 */
1919
20−import QtQuick 2.0
20+import QtQuick 2.4
2121import QMenuModel 0.1
2222
2323QtObject {
tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/MockLanguagePlugin.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818
1919Item {
2020 property var languageNames: ["English", "French", "Spanish"]
tests/mocks/Unity/Application/MirSurfaceItem.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818
1919Rectangle {
2020 id: root
tests/mocks/Unity/Application/VirtualKeyboard.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Unity.Application 0.1
1919
2020Item {
tests/mocks/Unity/Indicators/ActionRootState.qml+1−1
@@ -17,7 +17,7 @@
1717 * Nick Dedekind <nick.dedekind@canonical.com>
1818 */
1919
20−import QtQuick 2.0
20+import QtQuick 2.4
2121
2222QtObject {
2323 property var actionGroup
tests/mocks/Unity/Indicators/IndicatorsModel.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Unity.Indicators 0.1 as Indicators
1919
2020Indicators.FakeIndicatorsModel {
tests/mocks/Unity/Indicators/ModelActionRootState.qml+1−1
@@ -17,7 +17,7 @@
1717 * Nick Dedekind <nick.dedekind@canonical.com>
1818 */
1919
20−import QtQuick 2.0
20+import QtQuick 2.4
2121
2222Item {
2323 property var menu: null
tests/mocks/Utils/HomeKeyWatcher.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818
1919QtObject {
2020 signal activated()
tests/plugins/Dash/cardcreatortest.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.2
17+import QtQuick 2.4
1818import "../../../plugins/Dash/CardCreator.js" as CardCreator
1919
2020Item {
tests/plugins/Dash/horizontaljournaltest.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.1
17+import QtQuick 2.4
1818import Dash 0.1
1919
2020Item {
tests/plugins/Dash/horizontaljournaltry.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.1
17+import QtQuick 2.4
1818import Dash 0.1
1919
2020Item {
tests/plugins/Dash/listviewwithpageheadertest.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Dash 0.1
1919
2020Rectangle {
tests/plugins/Dash/listviewwithpageheadertestsection.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Dash 0.1
1919
2020Rectangle {
tests/plugins/Dash/listviewwithpageheadertestsectionexternalmodel.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Dash 0.1
1919
2020Rectangle {
tests/plugins/Dash/organicgridtest.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.1
17+import QtQuick 2.4
1818import Dash 0.1
1919
2020Item {
tests/plugins/Dash/organicgridtry.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.1
17+import QtQuick 2.4
1818import Dash 0.1
1919
2020Item {
tests/plugins/Dash/tst_CardAttributes.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import Dash 0.1
2020
tests/plugins/Dash/tst_CroppedImageMinimumSourceSize.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818import QtTest 1.0
1919import Ubuntu.Components 1.3
2020import Dash 0.1
tests/plugins/Dash/tst_ListViewWithPageHeaderQML.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import Dash 0.1
2020
tests/plugins/Dash/tst_ScopeStyle.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.2
17+import QtQuick 2.4
1818import QtTest 1.0
1919import Dash 0.1
2020import Ubuntu.Components 1.3
tests/plugins/Dash/verticaljournaltest.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.1
17+import QtQuick 2.4
1818import Dash 0.1
1919
2020Item {
tests/plugins/Dash/verticaljournaltry.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.1
17+import QtQuick 2.4
1818import Dash 0.1
1919
2020Item {
tests/plugins/LightDM/greeter.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import LightDM 0.1 as LightDM
1919
2020Item {
tests/plugins/Ubuntu/Gestures/DownwardsLauncher.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Gestures 0.1
1919import Ubuntu.Components 1.3
2020
tests/plugins/Ubuntu/Gestures/LeftwardsLauncher.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Gestures 0.1
1919import Ubuntu.Components 1.3
2020
tests/plugins/Ubuntu/Gestures/RightwardsLauncher.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Gestures 0.1
1919import Ubuntu.Components 1.3
2020
tests/plugins/Ubuntu/Gestures/UpwardsLauncher.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Gestures 0.1
1919import Ubuntu.Components 1.3
2020
tests/plugins/Ubuntu/Gestures/empty.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Gestures 0.1
1919
2020Item {
tests/plugins/Ubuntu/Gestures/touchGateExample.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Gestures 0.1
1919
2020Rectangle {
tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Unity.Test 0.1
2020
tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Ubuntu.Gestures 0.1
2020import Unity.Test 0.1
tests/plugins/Ubuntu/Gestures/tst_PressedOutsideNotifier.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Ubuntu.Gestures 0.1
2020
tests/plugins/Ubuntu/Gestures/tst_TouchGate.cpp+1−5
@@ -19,9 +19,7 @@
1919#include <QQmlEngine>
2020#include <QQuickView>
2121#include <QSharedPointer>
22−#if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0))
23− #include <private/qquickwindow_p.h>
24−#endif
22+#include <private/qquickwindow_p.h>
2523
2624// C++ std lib
2725#include <functional>
@@ -189,10 +187,8 @@ void tst_TouchGate::holdsEventsUntilGainsOwnership()
189187
190188 if (!ownershipAfterTouchEnd) {
191189 touchRegistry->removeCandidateOwnerForTouch(0, candidateItem);
192−#if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0))
193190 QQuickWindowPrivate *wp = QQuickWindowPrivate::get(testItem->window());
194191 wp->flushDelayedTouchEvent();
195−#endif
196192 // TouchGate should now open its flood gates and let testItem get all
197193 // events from touch 0 produced so far
198194 QCOMPARE(testItem->touchEventsReceived.count(), 2);
tests/plugins/Utils/tst_UtilsStyle.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.2
17+import QtQuick 2.4
1818import QtTest 1.0
1919import Utils 0.1
2020
tests/qmltests/Components/tst_Background.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.2
17+import QtQuick 2.4
1818import QtTest 1.0
1919import Unity.Test 0.1
2020
tests/qmltests/Components/tst_Carousel.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import "../../../qml/Components/"
2020import "../../../qml/Components/carousel.js" as Carousel
tests/qmltests/Components/tst_Dialogs.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.2
17+import QtQuick 2.4
1818import QtTest 1.0
1919import Ubuntu.Components 1.3
2020import Unity.Test 0.1
tests/qmltests/Components/tst_DragHandle.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import "../../../qml/Components"
1919import "tst_DragHandle"
2020import Ubuntu.Components 1.3
tests/qmltests/Components/tst_DragHandle/BidirectionalShowable.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import "../../../../qml/Components"
1919import Ubuntu.Components 1.3
2020import Ubuntu.Gestures 0.1
tests/qmltests/Components/tst_DragHandle/HorizontalShowable.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import "../../../../qml/Components"
1919import Ubuntu.Components 1.3
2020import Ubuntu.Gestures 0.1
tests/qmltests/Components/tst_DragHandle/VerticalShowable.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import "../../../../qml/Components"
1919import Ubuntu.Components 1.3
2020import Ubuntu.Gestures 0.1
tests/qmltests/Components/tst_DraggingArea.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import "../../../qml/Components"
2020
tests/qmltests/Components/tst_EdgeDragEvaluator.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import "../../../qml/Components"
1919
2020Item {
tests/qmltests/Components/tst_LazyImage.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import "../../../qml/Components"
2020import Ubuntu.Components 1.3
tests/qmltests/Components/tst_LazyImage/ImageControls.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import "../../../../qml/Components"
2020
tests/qmltests/Components/tst_Lockscreen.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import ".."
2020import "../../../qml/Components"
tests/qmltests/Components/tst_PhysicalKeysMapper.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import "../../../qml/Components"
2020
tests/qmltests/Components/tst_Rating.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import "../../../qml/Components"
2020import Ubuntu.Components 1.3
tests/qmltests/Components/tst_ResponsiveGridView.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import ".."
2020import "../../../qml/Components"
tests/qmltests/Components/tst_ResponsiveVerticalJournal.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import ".."
2020import "../../../qml/Components"
tests/qmltests/Components/tst_Showable.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import Ubuntu.Components 1.3
2020import Unity.Test 0.1 as UT
tests/qmltests/Components/tst_ZoomableImage.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import "../../../qml/Components"
2020import Unity.Test 0.1 as UT
tests/qmltests/Dash/Previews/MockPreviewWidget.qml+1−1
@@ -15,7 +15,7 @@
1515 *
1616 */
1717
18−import QtQuick 2.0
18+import QtQuick 2.4
1919import "../../../../qml/Dash/Previews"
2020
2121PreviewWidget {
tests/qmltests/Dash/Previews/tst_Preview.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import "../../../../qml/Dash/Previews"
2020import Unity.Test 0.1 as UT
tests/qmltests/Dash/Previews/tst_PreviewActions.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import "../../../../qml/Dash/Previews"
2020import Unity.Test 0.1 as UT
tests/qmltests/Dash/Previews/tst_PreviewAudioPlayback.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import Ubuntu.Components 1.3
2020import "../../../../qml/Dash/Previews"
tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import Ubuntu.Components 1.3
2020import "../../../../qml/Dash/Previews"
tests/qmltests/Dash/Previews/tst_PreviewHeader.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import "../../../../qml/Dash/Previews"
2020import Unity.Test 0.1 as UT
tests/qmltests/Dash/Previews/tst_PreviewImageGallery.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import "../../../../qml/Dash/Previews"
2020import Unity.Test 0.1 as UT
tests/qmltests/Dash/Previews/tst_PreviewPayments.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import "../../../../qml/Dash/Previews"
2020import Unity.Test 0.1 as UT
tests/qmltests/Dash/Previews/tst_PreviewProgress.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import "../../../../qml/Dash/Previews"
2020import Unity.Test 0.1 as UT
tests/qmltests/Dash/Previews/tst_PreviewRatingDisplay.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import Ubuntu.Components 1.3
2020import "../../../../qml/Dash/Previews"
tests/qmltests/Dash/Previews/tst_PreviewRatingEdit.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import Ubuntu.Components 1.3
2020import "../../../../qml/Dash/Previews"
tests/qmltests/Dash/Previews/tst_PreviewRatingInput.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import Ubuntu.Components 1.3
2020import "../../../../qml/Dash/Previews"
tests/qmltests/Dash/Previews/tst_PreviewTable.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import Ubuntu.Components 1.3
2020import "../../../../qml/Dash/Previews"
tests/qmltests/Dash/Previews/tst_PreviewTextSummary.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import Ubuntu.Components 1.3
2020import "../../../../qml/Dash/Previews"
tests/qmltests/Dash/Previews/tst_PreviewVideoPlayback.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import "../../../../qml/Dash/Previews"
2020import Unity.Test 0.1 as UT
tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import "../../../../qml/Dash/Previews"
2020import Unity.Test 0.1 as UT
tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import "../../../../qml/Dash/Previews"
2020import Unity.Test 0.1 as UT
tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingBoolean.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import QtTest 1.0
2020import "../../../../qml/Dash/ScopeSettings"
tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingList.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import QtTest 1.0
2020import "../../../../qml/Dash/ScopeSettings"
tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingNumber.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import QtTest 1.0
2020import "../../../../qml/Dash/ScopeSettings"
tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingString.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import QtTest 1.0
2020import "../../../../qml/Dash/ScopeSettings"
tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingsWidgetFactory.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import QtTest 1.0
2020import "../../../../qml/Dash/ScopeSettings"
tests/qmltests/Dash/tst_Card.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import Ubuntu.Components 1.3
2020import Unity.Test 0.1 as UT
tests/qmltests/Dash/tst_CardBenchmark.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import Ubuntu.Components 1.3
2020import Unity.Test 0.1 as UT
tests/qmltests/Dash/tst_CardTool.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import Ubuntu.Components 1.3
2020import Unity.Test 0.1 as UT
tests/qmltests/Dash/tst_Dash.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import "../../../qml/Dash"
2020import Ubuntu.Components 1.3
tests/qmltests/Dash/tst_DashContent.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import "../../../qml/Dash"
2020import "../../../qml/Components"
tests/qmltests/Dash/tst_GenericScopeView.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import Unity 0.2
2020import ".."
tests/qmltests/Dash/tst_PageHeader.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import ".."
2020import "../../../qml/Dash"
tests/qmltests/Dash/tst_PreviewListView.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import Ubuntu.Components 1.3
2020import "../../../qml/Dash"
tests/qmltests/Greeter/TestView.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import "../Components"
2020
tests/qmltests/Greeter/tst_Clock.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import ".."
2020import "../../../qml/Greeter"
tests/qmltests/Greeter/tst_Greeter.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import ".."
2020import "../../../qml/Greeter"
tests/qmltests/Greeter/tst_Infographics.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import ".."
2020import "../../../qml/Greeter"
tests/qmltests/Greeter/tst_NarrowView.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import ".."
2020import "../../../qml/Greeter"
tests/qmltests/Greeter/tst_WideView.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import ".."
2020import "../../../qml/Greeter"
tests/qmltests/Launcher/tst_Launcher.qml+2−2
@@ -14,8 +14,8 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
18−import QtQuick.Layouts 1.1
17+import QtQuick 2.4
18+import QtQuick.Layouts 1.2
1919import QtTest 1.0
2020import Unity.Test 0.1
2121import Ubuntu.Components 1.3
tests/qmltests/Notifications/tst_Notifications.qml+1−1
@@ -17,7 +17,7 @@
1717 * Mirco Mueller <mirco.mueller@canonical.com>
1818 */
1919
20−import QtQuick 2.0
20+import QtQuick 2.4
2121import QtTest 1.0
2222import ".."
2323import "../../../qml/Notifications"
tests/qmltests/Notifications/tst_OptionToggle.qml+1−1
@@ -17,7 +17,7 @@
1717 * Mirco Mueller <mirco.mueller@canonical.com>
1818 */
1919
20−import QtQuick 2.0
20+import QtQuick 2.4
2121import QtTest 1.0
2222import ".."
2323import "../../../qml/Notifications"
tests/qmltests/Notifications/tst_SwipeToAct.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import ".."
2020import "../../../qml/Notifications"
tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import ".."
2020import "../../../qml/Notifications"
tests/qmltests/Panel/IndicatorTest.qml+2−2
@@ -14,8 +14,8 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.1
18−import QtQuick.Layouts 1.1
17+import QtQuick 2.4
18+import QtQuick.Layouts 1.2
1919import QtTest 1.0
2020import "../../../qml/Panel"
2121import Ubuntu.Components 1.3
tests/qmltests/Panel/Indicators/tst_IndicatorsLight.qml+2−2
@@ -14,8 +14,8 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
18−import QtQuick.Layouts 1.1
17+import QtQuick 2.4
18+import QtQuick.Layouts 1.2
1919import Unity.Test 0.1 as UT
2020import Unity.Indicators 0.1 as Indicators
2121import Ubuntu.Components 1.3
tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import Unity.Test 0.1 as UT
2020import Ubuntu.Settings.Menus 0.1 as Menus
tests/qmltests/Panel/Indicators/tst_MessageMenuItemFactory.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import Unity.Test 0.1 as UT
2020import QMenuModel 0.1
tests/qmltests/Panel/tst_ActiveCallHint.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import Unity.Test 0.1 as UT
2020import Ubuntu.Telephony 0.1 as Telephony
tests/qmltests/Panel/tst_IndicatorItem.qml+2−2
@@ -14,8 +14,8 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.1
18−import QtQuick.Layouts 1.1
17+import QtQuick 2.4
18+import QtQuick.Layouts 1.2
1919import QtTest 1.0
2020import Ubuntu.Components 1.3
2121import Unity.Test 0.1 as UT
tests/qmltests/Panel/tst_IndicatorItemRow.qml+2−2
@@ -14,8 +14,8 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.1
18−import QtQuick.Layouts 1.1
17+import QtQuick 2.4
18+import QtQuick.Layouts 1.2
1919import QtTest 1.0
2020import "../../../qml/Panel"
2121import Ubuntu.Components 1.3
tests/qmltests/Panel/tst_IndicatorPage.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import Unity.Test 0.1 as UT
2020import Unity.Indicators 0.1 as Indicators
tests/qmltests/Panel/tst_IndicatorsBar.qml+2−2
@@ -14,8 +14,8 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.1
18−import QtQuick.Layouts 1.1
17+import QtQuick 2.4
18+import QtQuick.Layouts 1.2
1919import QtTest 1.0
2020import "../../../qml/Panel"
2121import Ubuntu.Components 1.3
tests/qmltests/Panel/tst_IndicatorsMenu.qml+2−2
@@ -14,8 +14,8 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.1
18−import QtQuick.Layouts 1.1
17+import QtQuick 2.4
18+import QtQuick.Layouts 1.2
1919import QtTest 1.0
2020import "../../../qml/Panel"
2121import Ubuntu.Components 1.3
tests/qmltests/Panel/tst_MenuContent.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import Unity.Test 0.1 as UT
2020import "../../../qml/Panel"
tests/qmltests/Panel/tst_Panel.qml+2−2
@@ -14,8 +14,8 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.1
18−import QtQuick.Layouts 1.1
17+import QtQuick 2.4
18+import QtQuick.Layouts 1.2
1919import QtTest 1.0
2020import Unity.Test 0.1
2121import Ubuntu.Components 1.3
tests/qmltests/Stages/ApplicationCheckBox.qml+2−2
@@ -14,8 +14,8 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
18−import QtQuick.Layouts 1.1
17+import QtQuick 2.4
18+import QtQuick.Layouts 1.2
1919import Ubuntu.Components 1.3
2020import Unity.Application 0.1
2121
tests/qmltests/Stages/RecursingChildSessionControl.qml+2−2
@@ -14,8 +14,8 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.1
18−import QtQuick.Layouts 1.1
17+import QtQuick 2.4
18+import QtQuick.Layouts 1.2
1919import Ubuntu.Components 1.3
2020import Unity.Application 0.1
2121
tests/qmltests/Stages/tst_ApplicationWindow.qml+2−2
@@ -14,8 +14,8 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.1
18−import QtQuick.Layouts 1.1
17+import QtQuick 2.4
18+import QtQuick.Layouts 1.2
1919import QtTest 1.0
2020import Unity.Test 0.1 as UT
2121import ".."
tests/qmltests/Stages/tst_DesktopStage.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import Ubuntu.Components 1.3
2020import Ubuntu.Components.ListItems 1.3 as ListItem
tests/qmltests/Stages/tst_PhoneStage.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import Unity.Test 0.1 as UT
2020import ".."
tests/qmltests/Stages/tst_SessionContainer.qml+2−2
@@ -14,8 +14,8 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.1
18−import QtQuick.Layouts 1.1
17+import QtQuick 2.4
18+import QtQuick.Layouts 1.2
1919import QtTest 1.0
2020import Unity.Test 0.1 as UT
2121import Ubuntu.Components 1.3
tests/qmltests/Stages/tst_Splash.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import Unity.Test 0.1 as UT
2020import ".."
tests/qmltests/Stages/tst_SpreadDelegate.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import Unity.Test 0.1 as UT
2020import ".."
tests/qmltests/Stages/tst_SurfaceContainer.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import Unity.Test 0.1
2020import ".."
tests/qmltests/Stages/tst_TabletStage.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import Ubuntu.Components 1.3
2020import Ubuntu.Components.ListItems 1.3 as ListItem
tests/qmltests/Stages/tst_WindowMoveResizeArea.qml+2−2
@@ -14,8 +14,8 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.1
18−import QtQuick.Layouts 1.1
17+import QtQuick 2.4
18+import QtQuick.Layouts 1.2
1919import QtTest 1.0
2020import Unity.Test 0.1 as UT
2121import ".."
tests/qmltests/Tutorial/tst_Tutorial.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import AccountsService 0.1
2020import LightDM 0.1 as LightDM
tests/qmltests/Wizard/tst_Wizard.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.3
17+import QtQuick 2.4
1818import QtTest 1.0
1919import AccountsService 0.1
2020import MeeGo.QOfono 0.2
tests/qmltests/tst_OrientedShell.qml+2−2
@@ -14,8 +14,8 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
18−import QtQuick.Layouts 1.1
17+import QtQuick 2.4
18+import QtQuick.Layouts 1.2
1919import QtTest 1.0
2020import Ubuntu.Components 1.3
2121import Ubuntu.Components.ListItems 1.3 as ListItem
tests/qmltests/tst_Shell.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import AccountsService 0.1
2020import GSettings 1.0
tests/qmltests/tst_ShellWithPin.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import QtTest 1.0
2020import AccountsService 0.1
tests/qmltests/utils/Unity/Test/MockObjectForInstanceOfTest.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818
1919Rectangle {
2020 property int dummy
tests/qmltests/utils/Unity/Test/MockObjectForInstanceOfTestChild.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818
1919MockObjectForInstanceOfTest {
2020 property int dummy2
tests/qmltests/utils/Unity/Test/tst_UnityTest.qml+1−1
@@ -15,7 +15,7 @@
1515 */
1616
1717
18−import QtQuick 2.0
18+import QtQuick 2.4
1919import QtTest 1.0
2020import Unity.Test 0.1
2121
tests/sdk/CMakeLists.txtdeleted−6
@@ -1,6 +0,0 @@
1−
2−#
3−# Test that all imports for Ubuntu.Components use the wanted version
4−#
5−
6−add_test(SDK ${CMAKE_CURRENT_SOURCE_DIR}/check_sdk.py ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
tests/utils/modules/Unity/Test/MouseTouchEmulationCheckbox.qml+2−2
@@ -14,8 +14,8 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
18−import QtQuick.Layouts 1.1
17+import QtQuick 2.4
18+import QtQuick.Layouts 1.2
1919import Ubuntu.Components 1.3
2020import Unity.Test 0.1
2121
tests/utils/modules/Unity/Test/TouchEventSequenceWrapper.cpp−2
@@ -27,12 +27,10 @@ TouchEventSequenceWrapper::TouchEventSequenceWrapper(QTest::QTouchEventSequence
2727void TouchEventSequenceWrapper::commit(bool processEvents)
2828{
2929 m_eventSequence.commit(processEvents);
30−#if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0))
3130 if (m_item->window()) {
3231 QQuickWindowPrivate *wp = QQuickWindowPrivate::get(m_item->window());
3332 wp->flushDelayedTouchEvent();
3433 }
35−#endif
3634}
3735
3836void TouchEventSequenceWrapper::move(int touchId, int x, int y)
tests/utils/modules/Unity/Test/UnityTestCase.qml+1−1
@@ -14,7 +14,7 @@
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1616
17−import QtQuick 2.0
17+import QtQuick 2.4
1818import QtTest 1.0
1919import Ubuntu.Components 1.3
2020import Unity.Test 0.1 as UT