Unity 8

Merge lp:~aacid/unity8/use_sdk_12_quick_24 into lp:unity8

  1. use_sdk_12_quick_24
  2. Merge into trunk
Proposed by Albert Astals Cid on 2015-10-02
Status: Rejected
Rejected by: Michał Sawicz on 2015-10-26
Proposed branch: lp:~aacid/unity8/use_sdk_12_quick_24
Merge into: lp:unity8
Prerequisite: lp:~aacid/unity8/use_sdk12
Diff against target: 4522 lines (+369/-392)
334 files modified
CMakeLists.txt (+7/-7)
debian/control (+4/-4)
plugins/Dash/CardAttributes.qml (+1/-1)
plugins/Dash/CardCreator.js (+1/-1)
plugins/Dash/CardCreatorCache.qml (+1/-1)
plugins/Dash/CroppedImageMinimumSourceSize.qml (+1/-1)
plugins/Dash/ScopeStyle.qml (+1/-1)
plugins/Dash/abstractdashview.h (+0/-4)
plugins/Dash/horizontaljournal.cpp (+0/-4)
plugins/Dash/horizontaljournal.h (+0/-4)
plugins/Dash/organicgrid.cpp (+0/-4)
plugins/Dash/organicgrid.h (+0/-4)
plugins/Dash/verticaljournal.cpp (+0/-4)
plugins/Dash/verticaljournal.h (+0/-4)
qml/Components/Background.qml (+1/-1)
qml/Components/BaseCarouselDelegate.qml (+1/-1)
qml/Components/Carousel.qml (+1/-1)
qml/Components/Circle.qml (+1/-1)
qml/Components/DelayedLockscreen.qml (+1/-1)
qml/Components/Dialogs.qml (+1/-1)
qml/Components/DragHandle.qml (+1/-1)
qml/Components/DraggingArea.qml (+1/-1)
qml/Components/EdgeDragEvaluator.qml (+1/-1)
qml/Components/InputMethod.qml (+1/-1)
qml/Components/LazyImage.qml (+1/-1)
qml/Components/ListItems/Header.qml (+1/-1)
qml/Components/ListItems/ThinDivider.qml (+1/-1)
qml/Components/Lockscreen.qml (+1/-1)
qml/Components/PanelState/PanelState.qml (+1/-1)
qml/Components/PassphraseLockscreen.qml (+1/-1)
qml/Components/PhysicalKeysMapper.qml (+1/-1)
qml/Components/PinLockscreen.qml (+1/-1)
qml/Components/PinPadButton.qml (+1/-1)
qml/Components/Rating.qml (+1/-1)
qml/Components/RatingStyle.qml (+1/-1)
qml/Components/ResponsiveGridView.qml (+1/-1)
qml/Components/ResponsiveVerticalJournal.qml (+1/-1)
qml/Components/ScreenGrabber.qml (+1/-1)
qml/Components/ScrollCalculator.qml (+1/-1)
qml/Components/SearchHistoryModel/SearchHistoryModel.qml (+1/-1)
qml/Components/ShellDialog.qml (+1/-1)
qml/Components/Showable.qml (+1/-1)
qml/Components/StandardAnimation.qml (+1/-1)
qml/Components/UbuntuShapeForItem.qml (+1/-1)
qml/Components/Unity8Settings.qml (+1/-1)
qml/Components/UnityInputInfo/UnityInputInfo.qml (+1/-1)
qml/Components/WindowControlButtons.qml (+1/-1)
qml/Components/WindowScreenshot.qml (+1/-1)
qml/Components/WrongPasswordAnimation.qml (+1/-1)
qml/Components/ZoomableImage.qml (+1/-1)
qml/Dash/CardCarousel.qml (+1/-1)
qml/Dash/CardGrid.qml (+1/-1)
qml/Dash/CardHorizontalList.qml (+1/-1)
qml/Dash/CardTool.qml (+1/-1)
qml/Dash/CardVerticalJournal.qml (+1/-1)
qml/Dash/Dash.qml (+1/-1)
qml/Dash/DashApplication.qml (+1/-1)
qml/Dash/DashBackground.qml (+1/-1)
qml/Dash/DashCategoryBase.qml (+1/-1)
qml/Dash/DashContent.qml (+1/-1)
qml/Dash/DashNavigation.qml (+1/-1)
qml/Dash/DashNavigationButton.qml (+1/-1)
qml/Dash/DashNavigationList.qml (+1/-1)
qml/Dash/DashRenderer.qml (+1/-1)
qml/Dash/GenericScopeView.qml (+1/-1)
qml/Dash/PageHeader.qml (+1/-1)
qml/Dash/PreviewListView.qml (+1/-1)
qml/Dash/Previews/Preview.qml (+1/-1)
qml/Dash/Previews/PreviewActionButton.qml (+1/-1)
qml/Dash/Previews/PreviewActionCombo.qml (+1/-1)
qml/Dash/Previews/PreviewActions.qml (+1/-1)
qml/Dash/Previews/PreviewAudioPlayback.qml (+1/-1)
qml/Dash/Previews/PreviewComment.qml (+1/-1)
qml/Dash/Previews/PreviewCommentInput.qml (+1/-1)
qml/Dash/Previews/PreviewExpandable.qml (+1/-1)
qml/Dash/Previews/PreviewHeader.qml (+1/-1)
qml/Dash/Previews/PreviewIconActions.qml (+1/-1)
qml/Dash/Previews/PreviewImageGallery.qml (+1/-1)
qml/Dash/Previews/PreviewOverlay.qml (+1/-1)
qml/Dash/Previews/PreviewPayments.qml (+1/-1)
qml/Dash/Previews/PreviewProgress.qml (+1/-1)
qml/Dash/Previews/PreviewRatingDisplay.qml (+1/-1)
qml/Dash/Previews/PreviewRatingInput.qml (+1/-1)
qml/Dash/Previews/PreviewTable.qml (+1/-1)
qml/Dash/Previews/PreviewTextSummary.qml (+1/-1)
qml/Dash/Previews/PreviewVideoPlayback.qml (+1/-1)
qml/Dash/Previews/PreviewWidget.qml (+1/-1)
qml/Dash/Previews/PreviewWidgetFactory.qml (+1/-1)
qml/Dash/Previews/PreviewZoomableImage.qml (+1/-1)
qml/Dash/PullToRefreshScopeStyle.qml (+1/-1)
qml/Dash/ScopeListView.qml (+1/-1)
qml/Dash/ScopeSettings/ScopeSetting.qml (+1/-1)
qml/Dash/ScopeSettings/ScopeSettingBoolean.qml (+1/-1)
qml/Dash/ScopeSettings/ScopeSettingList.qml (+1/-1)
qml/Dash/ScopeSettings/ScopeSettingNumber.qml (+1/-1)
qml/Dash/ScopeSettings/ScopeSettingString.qml (+1/-1)
qml/Dash/ScopeSettings/ScopeSettingsWidgetFactory.qml (+1/-1)
qml/Dash/ScopeSettingsPage.qml (+1/-1)
qml/Dash/ScopesList.qml (+1/-1)
qml/Dash/ScopesListCategory.qml (+1/-1)
qml/Dash/ScopesListCategoryItem.qml (+1/-1)
qml/DeviceConfiguration.qml (+1/-1)
qml/Greeter/Clock.qml (+1/-1)
qml/Greeter/CoverPage.qml (+1/-1)
qml/Greeter/Dot.qml (+1/-1)
qml/Greeter/Greeter.qml (+1/-1)
qml/Greeter/Infographics.qml (+1/-1)
qml/Greeter/IntegratedLightDMImpl.qml (+1/-1)
qml/Greeter/LightDM.qml (+1/-1)
qml/Greeter/LoginList.qml (+1/-1)
qml/Greeter/NarrowView.qml (+1/-1)
qml/Greeter/ObjectPositioner.qml (+1/-1)
qml/Greeter/ShimGreeter.qml (+1/-1)
qml/Greeter/WideView.qml (+1/-1)
qml/Launcher/FoldingLauncherDelegate.qml (+1/-1)
qml/Launcher/Launcher.qml (+1/-1)
qml/Launcher/LauncherDelegate.qml (+1/-1)
qml/Launcher/LauncherPanel.qml (+1/-1)
qml/Notifications/Notification.qml (+1/-1)
qml/Notifications/NotificationMenuItemFactory.qml (+1/-1)
qml/Notifications/Notifications.qml (+1/-1)
qml/Notifications/OptionToggle.qml (+1/-1)
qml/Notifications/ShapedIcon.qml (+1/-1)
qml/Notifications/SwipeToAct.qml (+1/-1)
qml/OrientedShell.qml (+2/-2)
qml/Panel/ActiveCallHint.qml (+1/-1)
qml/Panel/Handle.qml (+1/-1)
qml/Panel/IndicatorItem.qml (+1/-1)
qml/Panel/IndicatorItemRow.qml (+1/-1)
qml/Panel/IndicatorPage.qml (+1/-1)
qml/Panel/Indicators/IndicatorBase.qml (+1/-1)
qml/Panel/Indicators/IndicatorDelegate.qml (+1/-1)
qml/Panel/Indicators/IndicatorsLight.qml (+1/-1)
qml/Panel/Indicators/MenuItemFactory.qml (+1/-1)
qml/Panel/Indicators/MessageMenuItemFactory.qml (+1/-1)
qml/Panel/Indicators/ModemInfoItem.qml (+1/-1)
qml/Panel/Indicators/RoamingIndication.qml (+1/-1)
qml/Panel/Indicators/client/IndicatorRepresentation.qml (+1/-1)
qml/Panel/Indicators/client/IndicatorsClient.qml (+1/-1)
qml/Panel/Indicators/client/IndicatorsList.qml (+1/-1)
qml/Panel/Indicators/client/IndicatorsTree.qml (+1/-1)
qml/Panel/IndicatorsBar.qml (+1/-1)
qml/Panel/IndicatorsMenu.qml (+1/-1)
qml/Panel/MenuContent.qml (+1/-1)
qml/Panel/Panel.qml (+1/-1)
qml/Panel/PanelBackground.qml (+1/-1)
qml/Panel/PanelSeparatorLine.qml (+1/-1)
qml/Panel/PanelVelocityCalculator.qml (+1/-1)
qml/Rotation/HalfLoopRotationAnimation.qml (+1/-1)
qml/Rotation/ImmediateRotationAction.qml (+1/-1)
qml/Rotation/NinetyRotationAnimation.qml (+1/-1)
qml/Rotation/RotationStates.qml (+1/-1)
qml/ScopeTool.qml (+1/-1)
qml/Shell.qml (+2/-2)
qml/Stages/Animations/BaseSessionAnimation.qml (+1/-1)
qml/Stages/Animations/SwipeFromBottomAnimation.qml (+1/-1)
qml/Stages/ApplicationWindow.qml (+1/-1)
qml/Stages/DecoratedWindow.qml (+1/-1)
qml/Stages/DesktopSpreadDelegate.qml (+1/-1)
qml/Stages/MainViewStyle.qml (+1/-1)
qml/Stages/OrientationChangeAnimation.qml (+1/-1)
qml/Stages/PageHeadStyle.qml (+1/-1)
qml/Stages/PhoneStage.qml (+1/-1)
qml/Stages/SessionContainer.qml (+1/-1)
qml/Stages/ShimStage.qml (+1/-1)
qml/Stages/Splash.qml (+2/-2)
qml/Stages/SpreadDelegate.qml (+2/-2)
qml/Stages/SpreadMaths.qml (+1/-1)
qml/Stages/SurfaceContainer.qml (+1/-1)
qml/Stages/TabletStage.qml (+1/-1)
qml/Stages/TransformedSpreadDelegate.qml (+1/-1)
qml/Stages/TransformedTabletSpreadDelegate.qml (+1/-1)
qml/Stages/WindowDecoration.qml (+1/-1)
qml/Stages/WindowMoveResizeArea.qml (+1/-1)
qml/Tutorial/Arrow.qml (+1/-1)
qml/Tutorial/Slider.qml (+1/-1)
qml/Tutorial/Tick.qml (+1/-1)
qml/Tutorial/Tutorial.qml (+1/-1)
qml/Tutorial/TutorialBottom.qml (+1/-1)
qml/Tutorial/TutorialBottomFinish.qml (+1/-1)
qml/Tutorial/TutorialContent.qml (+1/-1)
qml/Tutorial/TutorialLeft.qml (+1/-1)
qml/Tutorial/TutorialLeftFinish.qml (+1/-1)
qml/Tutorial/TutorialPage.qml (+1/-1)
qml/Tutorial/TutorialRight.qml (+1/-1)
qml/Wizard/CheckableSetting.qml (+1/-1)
qml/Wizard/Page.qml (+1/-1)
qml/Wizard/Pages.qml (+1/-1)
qml/Wizard/Pages/10-welcome.qml (+1/-1)
qml/Wizard/Pages/20-sim.qml (+1/-1)
qml/Wizard/Pages/30-passwd-type.qml (+1/-1)
qml/Wizard/Pages/40-wifi.qml (+1/-1)
qml/Wizard/Pages/50-location.qml (+1/-1)
qml/Wizard/Pages/60-reporting.qml (+1/-1)
qml/Wizard/Pages/80-finished.qml (+1/-1)
qml/Wizard/Pages/here-terms.qml (+1/-1)
qml/Wizard/Pages/passwd-confirm.qml (+1/-1)
qml/Wizard/Pages/passwd-set.qml (+1/-1)
qml/Wizard/StackButton.qml (+1/-1)
qml/Wizard/Wizard.qml (+1/-1)
tests/CMakeLists.txt (+1/-1)
tests/imports/CMakeLists.txt (+2/-2)
tests/imports/check_imports.py (+29/-18)
tests/mocks/MeeGo/QOfono/MockOfonoSimManager.qml (+1/-1)
tests/mocks/QMenuModel/QDBusActionGroup.qml (+2/-2)
tests/mocks/QMenuModel/UnityMenuAction.qml (+1/-1)
tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/MockLanguagePlugin.qml (+1/-1)
tests/mocks/Ubuntu/Web/WebView.qml (+1/-1)
tests/mocks/Unity/Application/resources/MirSurfaceItem.qml (+1/-1)
tests/mocks/Unity/Application/resources/VirtualKeyboard.qml (+1/-1)
tests/mocks/Unity/Indicators/ActionRootState.qml (+1/-1)
tests/mocks/Unity/Indicators/IndicatorsModel.qml (+1/-1)
tests/mocks/Unity/Indicators/ModelActionRootState.qml (+1/-1)
tests/mocks/Utils/HomeKeyWatcher.qml (+1/-1)
tests/plugins/Dash/cardcreatortest.qml (+1/-1)
tests/plugins/Dash/horizontaljournaltest.qml (+1/-1)
tests/plugins/Dash/horizontaljournaltry.qml (+1/-1)
tests/plugins/Dash/listviewwithpageheadertest.qml (+1/-1)
tests/plugins/Dash/listviewwithpageheadertestsection.qml (+1/-1)
tests/plugins/Dash/listviewwithpageheadertestsectionexternalmodel.qml (+1/-1)
tests/plugins/Dash/organicgridtest.qml (+1/-1)
tests/plugins/Dash/organicgridtry.qml (+1/-1)
tests/plugins/Dash/tst_CardAttributes.qml (+1/-1)
tests/plugins/Dash/tst_CroppedImageMinimumSourceSize.qml (+1/-1)
tests/plugins/Dash/tst_ListViewWithPageHeaderQML.qml (+1/-1)
tests/plugins/Dash/tst_ScopeStyle.qml (+1/-1)
tests/plugins/Dash/verticaljournaltest.qml (+1/-1)
tests/plugins/Dash/verticaljournaltry.qml (+1/-1)
tests/plugins/IntegratedLightDM/greeter.qml (+1/-1)
tests/plugins/Ubuntu/Gestures/DownwardsLauncher.qml (+1/-1)
tests/plugins/Ubuntu/Gestures/LeftwardsLauncher.qml (+1/-1)
tests/plugins/Ubuntu/Gestures/RightwardsLauncher.qml (+1/-1)
tests/plugins/Ubuntu/Gestures/UpwardsLauncher.qml (+1/-1)
tests/plugins/Ubuntu/Gestures/empty.qml (+1/-1)
tests/plugins/Ubuntu/Gestures/touchGateExample.qml (+1/-1)
tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.qml (+1/-1)
tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.qml (+1/-1)
tests/plugins/Ubuntu/Gestures/tst_PressedOutsideNotifier.qml (+1/-1)
tests/plugins/Ubuntu/Gestures/tst_TouchGate.cpp (+1/-5)
tests/plugins/Utils/tst_UtilsStyle.qml (+1/-1)
tests/qmltests/Components/tst_Background.qml (+1/-1)
tests/qmltests/Components/tst_Carousel.qml (+1/-1)
tests/qmltests/Components/tst_Dialogs.qml (+1/-1)
tests/qmltests/Components/tst_DragHandle.qml (+1/-1)
tests/qmltests/Components/tst_DragHandle/BidirectionalShowable.qml (+1/-1)
tests/qmltests/Components/tst_DragHandle/HorizontalShowable.qml (+1/-1)
tests/qmltests/Components/tst_DragHandle/VerticalShowable.qml (+1/-1)
tests/qmltests/Components/tst_DraggingArea.qml (+1/-1)
tests/qmltests/Components/tst_EdgeDragEvaluator.qml (+1/-1)
tests/qmltests/Components/tst_LazyImage.qml (+1/-1)
tests/qmltests/Components/tst_LazyImage/ImageControls.qml (+1/-1)
tests/qmltests/Components/tst_Lockscreen.qml (+1/-1)
tests/qmltests/Components/tst_PhysicalKeysMapper.qml (+1/-1)
tests/qmltests/Components/tst_Rating.qml (+1/-1)
tests/qmltests/Components/tst_ResponsiveGridView.qml (+1/-1)
tests/qmltests/Components/tst_ResponsiveVerticalJournal.qml (+1/-1)
tests/qmltests/Components/tst_Showable.qml (+1/-1)
tests/qmltests/Components/tst_ZoomableImage.qml (+1/-1)
tests/qmltests/Dash/Previews/MockPreviewWidget.qml (+1/-1)
tests/qmltests/Dash/Previews/tst_Preview.qml (+1/-1)
tests/qmltests/Dash/Previews/tst_PreviewActions.qml (+1/-1)
tests/qmltests/Dash/Previews/tst_PreviewAudioPlayback.qml (+1/-1)
tests/qmltests/Dash/Previews/tst_PreviewComment.qml (+1/-1)
tests/qmltests/Dash/Previews/tst_PreviewCommentInput.qml (+1/-1)
tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml (+1/-1)
tests/qmltests/Dash/Previews/tst_PreviewHeader.qml (+1/-1)
tests/qmltests/Dash/Previews/tst_PreviewIconActions.qml (+1/-1)
tests/qmltests/Dash/Previews/tst_PreviewImageGallery.qml (+1/-1)
tests/qmltests/Dash/Previews/tst_PreviewPayments.qml (+1/-1)
tests/qmltests/Dash/Previews/tst_PreviewProgress.qml (+1/-1)
tests/qmltests/Dash/Previews/tst_PreviewRatingDisplay.qml (+1/-1)
tests/qmltests/Dash/Previews/tst_PreviewRatingEdit.qml (+1/-1)
tests/qmltests/Dash/Previews/tst_PreviewRatingInput.qml (+1/-1)
tests/qmltests/Dash/Previews/tst_PreviewTable.qml (+1/-1)
tests/qmltests/Dash/Previews/tst_PreviewTextSummary.qml (+1/-1)
tests/qmltests/Dash/Previews/tst_PreviewVideoPlayback.qml (+1/-1)
tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml (+1/-1)
tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qml (+1/-1)
tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingBoolean.qml (+1/-1)
tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingList.qml (+1/-1)
tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingNumber.qml (+1/-1)
tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingString.qml (+1/-1)
tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingsWidgetFactory.qml (+1/-1)
tests/qmltests/Dash/tst_Card.qml (+1/-1)
tests/qmltests/Dash/tst_CardBenchmark.qml (+1/-1)
tests/qmltests/Dash/tst_CardTool.qml (+1/-1)
tests/qmltests/Dash/tst_Dash.qml (+1/-1)
tests/qmltests/Dash/tst_DashContent.qml (+1/-1)
tests/qmltests/Dash/tst_GenericScopeView.qml (+1/-1)
tests/qmltests/Dash/tst_PageHeader.qml (+1/-1)
tests/qmltests/Dash/tst_PreviewListView.qml (+1/-1)
tests/qmltests/Greeter/TestView.qml (+1/-1)
tests/qmltests/Greeter/tst_Clock.qml (+1/-1)
tests/qmltests/Greeter/tst_Greeter.qml (+1/-1)
tests/qmltests/Greeter/tst_Infographics.qml (+1/-1)
tests/qmltests/Greeter/tst_NarrowView.qml (+1/-1)
tests/qmltests/Greeter/tst_WideView.qml (+1/-1)
tests/qmltests/Launcher/tst_Launcher.qml (+1/-1)
tests/qmltests/Notifications/tst_OptionToggle.qml (+1/-1)
tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml (+1/-1)
tests/qmltests/Panel/IndicatorTest.qml (+1/-1)
tests/qmltests/Panel/Indicators/tst_IndicatorsLight.qml (+1/-1)
tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml (+1/-1)
tests/qmltests/Panel/Indicators/tst_MessageMenuItemFactory.qml (+1/-1)
tests/qmltests/Panel/tst_ActiveCallHint.qml (+1/-1)
tests/qmltests/Panel/tst_IndicatorItem.qml (+1/-1)
tests/qmltests/Panel/tst_IndicatorItemRow.qml (+1/-1)
tests/qmltests/Panel/tst_IndicatorPage.qml (+1/-1)
tests/qmltests/Panel/tst_IndicatorsBar.qml (+1/-1)
tests/qmltests/Panel/tst_IndicatorsMenu.qml (+1/-1)
tests/qmltests/Panel/tst_MenuContent.qml (+1/-1)
tests/qmltests/Panel/tst_Panel.qml (+1/-1)
tests/qmltests/Stages/ApplicationCheckBox.qml (+1/-1)
tests/qmltests/Stages/RecursingChildSessionControl.qml (+1/-1)
tests/qmltests/Stages/tst_ApplicationWindow.qml (+1/-1)
tests/qmltests/Stages/tst_DesktopStage.qml (+1/-1)
tests/qmltests/Stages/tst_PhoneStage.qml (+1/-1)
tests/qmltests/Stages/tst_SessionContainer.qml (+1/-1)
tests/qmltests/Stages/tst_Splash.qml (+1/-1)
tests/qmltests/Stages/tst_SpreadDelegate.qml (+1/-1)
tests/qmltests/Stages/tst_SurfaceContainer.qml (+1/-1)
tests/qmltests/Stages/tst_TabletStage.qml (+1/-1)
tests/qmltests/Stages/tst_WindowMoveResizeArea.qml (+1/-1)
tests/qmltests/Tutorial/tst_Tutorial.qml (+1/-1)
tests/qmltests/Wizard/tst_Wizard.qml (+1/-1)
tests/qmltests/tst_OrientedShell.qml (+1/-1)
tests/qmltests/tst_Shell.qml (+1/-1)
tests/qmltests/tst_ShellWithPin.qml (+1/-1)
tests/qmltests/utils/Unity/Test/MockObjectForInstanceOfTest.qml (+1/-1)
tests/qmltests/utils/Unity/Test/MockObjectForInstanceOfTestChild.qml (+1/-1)
tests/qmltests/utils/Unity/Test/tst_UnityTest.qml (+1/-1)
tests/utils/modules/Unity/Test/MouseTouchEmulationCheckbox.qml (+1/-1)
tests/utils/modules/Unity/Test/TouchEventSequenceWrapper.cpp (+0/-2)
tests/utils/modules/Unity/Test/UnityTestCase.qml (+1/-1)
To merge this branch: bzr merge lp:~aacid/unity8/use_sdk_12_quick_24
Reviewer Review Type Date Requested Status
Michał Sawicz 2015-10-02 Disapprove on 2015-10-26
PS Jenkins bot continuous-integration Needs Fixing on 2015-10-08
Review via email: mp+273185@code.launchpad.net

Commit Message

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

Description of the Change

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
There's changes but i don't think we need to subscribe them

 * If you changed the UI, has there been a design review?
N/A

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1996
http://jenkins.qa.ubuntu.com/job/unity8-ci/6406/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4471
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/785
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1118
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/437
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1013
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1014
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/645
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/646
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3636
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4468
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4468/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23886
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/472
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/785
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/785/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23887

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6406/rebuild

review: Needs Fixing (continuous-integration)
lp:~aacid/unity8/use_sdk_12_quick_24 updated on 2015-10-02
1997. By Albert Astals Cid on 2015-10-02

Merge

PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1997
http://jenkins.qa.ubuntu.com/job/unity8-ci/6409/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4475
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/788
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1121
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/440
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1016
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1017
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/648
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/649
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3640
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4472
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4472/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23900
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/475
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/788
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/788/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23899

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6409/rebuild

review: Needs Fixing (continuous-integration)
lp:~aacid/unity8/use_sdk_12_quick_24 updated on 2015-10-08
1998. By Albert Astals Cid on 2015-10-08

Merge

1999. By Albert Astals Cid on 2015-10-08

Merge

PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1998
http://jenkins.qa.ubuntu.com/job/unity8-ci/6427/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4545
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/806
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1139
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/458
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1034
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1035
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/666
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/667
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3688
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4542
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4542/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24055
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/484
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/806
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/806/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24056

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6427/rebuild

review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1999
http://jenkins.qa.ubuntu.com/job/unity8-ci/6430/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4550
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/809
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1142
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/461
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1037
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1038
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/669
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/670
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3692
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4547
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4547/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24064
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/486
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/809
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/809/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24065

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6430/rebuild

review: Needs Fixing (continuous-integration)
Michał Sawicz (saviq) wrote :

Going for SDK 1.3 directly after all.

review: Disapprove

Unmerged revisions

1999. By Albert Astals Cid on 2015-10-08

Merge

1998. By Albert Astals Cid on 2015-10-08

Merge

1997. By Albert Astals Cid on 2015-10-02

Merge

1996. By Albert Astals Cid on 2015-10-02

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

1995. By Albert Astals Cid on 2015-10-02

Use SDK 1.2 all over the board

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2015-09-30 16:49:52 +0000
3+++ CMakeLists.txt 2015-10-08 09:07:28 +0000
4@@ -49,13 +49,13 @@
5 ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests)
6
7 include(FindPkgConfig)
8-find_package(Qt5Core 5.2 REQUIRED)
9-find_package(Qt5Qml 5.2 REQUIRED)
10-find_package(Qt5Quick 5.2 REQUIRED)
11-find_package(Qt5Gui 5.2 REQUIRED)
12-find_package(Qt5DBus 5.2 REQUIRED)
13-find_package(Qt5Concurrent 5.2 REQUIRED)
14-find_package(Qt5Sql 5.2 REQUIRED)
15+find_package(Qt5Core 5.4 REQUIRED)
16+find_package(Qt5Qml 5.4 REQUIRED)
17+find_package(Qt5Quick 5.4 REQUIRED)
18+find_package(Qt5Gui 5.4 REQUIRED)
19+find_package(Qt5DBus 5.4 REQUIRED)
20+find_package(Qt5Concurrent 5.4 REQUIRED)
21+find_package(Qt5Sql 5.4 REQUIRED)
22
23 pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application>=8)
24
25
26=== modified file 'debian/control'
27--- debian/control 2015-09-23 18:15:40 +0000
28+++ debian/control 2015-10-08 09:07:28 +0000
29@@ -41,12 +41,12 @@
30 qml-module-qtsysteminfo,
31 qml-module-qttest,
32 qt5-default,
33- qtbase5-dev (>= 5.2.1),
34+ qtbase5-dev (>= 5.4),
35 qtbase5-dev-tools,
36- qtbase5-private-dev (>= 5.2.1),
37- qtdeclarative5-dev (>= 5.2.1),
38+ qtbase5-private-dev (>= 5.4),
39+ qtdeclarative5-dev (>= 5.4),
40 qtdeclarative5-dev-tools,
41- qtdeclarative5-private-dev (>= 5.2.1),
42+ qtdeclarative5-private-dev (>= 5.4),
43 qtdeclarative5-qtmultimedia-plugin,
44 qtdeclarative5-ubuntu-settings-components (>= 0.6),
45 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1.1239) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1239),
46
47=== modified file 'plugins/Dash/CardAttributes.qml'
48--- plugins/Dash/CardAttributes.qml 2015-10-08 09:07:28 +0000
49+++ plugins/Dash/CardAttributes.qml 2015-10-08 09:07:28 +0000
50@@ -14,7 +14,7 @@
51 * along with this program. If not, see <http://www.gnu.org/licenses/>.
52 */
53
54-import QtQuick 2.2
55+import QtQuick 2.4
56 import QtQuick.Layouts 1.1
57 import Ubuntu.Components 1.2
58
59
60=== modified file 'plugins/Dash/CardCreator.js'
61--- plugins/Dash/CardCreator.js 2015-10-08 09:07:28 +0000
62+++ plugins/Dash/CardCreator.js 2015-10-08 09:07:28 +0000
63@@ -697,7 +697,7 @@
64 }
65
66 function createCardComponent(parent, template, components) {
67- var imports = 'import QtQuick 2.2; \n\
68+ var imports = 'import QtQuick 2.4; \n\
69 import Ubuntu.Components 1.2; \n\
70 import Ubuntu.Settings.Components 0.1; \n\
71 import Dash 0.1;\n\
72
73=== modified file 'plugins/Dash/CardCreatorCache.qml'
74--- plugins/Dash/CardCreatorCache.qml 2014-05-05 14:45:04 +0000
75+++ plugins/Dash/CardCreatorCache.qml 2015-10-08 09:07:28 +0000
76@@ -15,7 +15,7 @@
77 */
78
79 pragma Singleton
80-import QtQuick 2.2
81+import QtQuick 2.4
82 import "CardCreator.js" as CardCreator
83
84 QtObject {
85
86=== modified file 'plugins/Dash/CroppedImageMinimumSourceSize.qml'
87--- plugins/Dash/CroppedImageMinimumSourceSize.qml 2015-08-31 13:29:42 +0000
88+++ plugins/Dash/CroppedImageMinimumSourceSize.qml 2015-10-08 09:07:28 +0000
89@@ -14,7 +14,7 @@
90 * along with this program. If not, see <http://www.gnu.org/licenses/>.
91 */
92
93-import QtQuick 2.3
94+import QtQuick 2.4
95
96 Image {
97 id: root
98
99=== modified file 'plugins/Dash/ScopeStyle.qml'
100--- plugins/Dash/ScopeStyle.qml 2015-10-08 09:07:28 +0000
101+++ plugins/Dash/ScopeStyle.qml 2015-10-08 09:07:28 +0000
102@@ -14,7 +14,7 @@
103 * along with this program. If not, see <http://www.gnu.org/licenses/>.
104 */
105
106-import QtQuick 2.2
107+import QtQuick 2.4
108 import Utils 0.1
109 import Ubuntu.Components 1.2
110
111
112=== modified file 'plugins/Dash/abstractdashview.h'
113--- plugins/Dash/abstractdashview.h 2014-12-03 10:28:53 +0000
114+++ plugins/Dash/abstractdashview.h 2015-10-08 09:07:28 +0000
115@@ -109,11 +109,7 @@
116 virtual void doRelayout() = 0;
117 virtual void updateItemCulling(qreal visibleFromY, qreal visibleToY) = 0;
118 virtual void calculateImplicitHeight() = 0;
119-#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))
120- virtual void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) = 0;
121-#else
122 virtual void processModelRemoves(const QVector<QQmlChangeSet::Change> &removes) = 0;
123-#endif
124
125 QQmlDelegateModel *m_delegateModel;
126
127
128=== modified file 'plugins/Dash/horizontaljournal.cpp'
129--- plugins/Dash/horizontaljournal.cpp 2015-09-14 09:11:08 +0000
130+++ plugins/Dash/horizontaljournal.cpp 2015-10-08 09:07:28 +0000
131@@ -182,11 +182,7 @@
132 }
133 }
134
135-#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))
136-void HorizontalJournal::processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes)
137-#else
138 void HorizontalJournal::processModelRemoves(const QVector<QQmlChangeSet::Change> &removes)
139-#endif
140 {
141 Q_FOREACH(const QQmlChangeSet::Change &remove, removes) {
142 for (int i = remove.count - 1; i >= 0; --i) {
143
144=== modified file 'plugins/Dash/horizontaljournal.h'
145--- plugins/Dash/horizontaljournal.h 2014-11-26 10:09:06 +0000
146+++ plugins/Dash/horizontaljournal.h 2015-10-08 09:07:28 +0000
147@@ -52,11 +52,7 @@
148 void calculateImplicitHeight() override;
149 void doRelayout() override;
150 void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;
151-#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))
152- void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) override;
153-#else
154 void processModelRemoves(const QVector<QQmlChangeSet::Change> &removes) override;
155-#endif
156
157 int m_firstVisibleIndex;
158 QList<QQuickItem*> m_visibleItems;
159
160=== modified file 'plugins/Dash/organicgrid.cpp'
161--- plugins/Dash/organicgrid.cpp 2015-09-14 09:11:08 +0000
162+++ plugins/Dash/organicgrid.cpp 2015-10-08 09:07:28 +0000
163@@ -235,11 +235,7 @@
164 }
165 }
166
167-#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))
168-void OrganicGrid::processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes)
169-#else
170 void OrganicGrid::processModelRemoves(const QVector<QQmlChangeSet::Change> &removes)
171-#endif
172 {
173 Q_FOREACH(const QQmlChangeSet::Change &remove, removes) {
174 for (int i = remove.count - 1; i >= 0; --i) {
175
176=== modified file 'plugins/Dash/organicgrid.h'
177--- plugins/Dash/organicgrid.h 2014-11-26 10:09:06 +0000
178+++ plugins/Dash/organicgrid.h 2015-10-08 09:07:28 +0000
179@@ -79,11 +79,7 @@
180 void doRelayout() override;
181 void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;
182 void calculateImplicitHeight() override;
183-#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))
184- void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) override;
185-#else
186 void processModelRemoves(const QVector<QQmlChangeSet::Change> &removes) override;
187-#endif
188
189 QSizeF m_smallDelegateSize;
190 QSizeF m_bigDelegateSize;
191
192=== modified file 'plugins/Dash/verticaljournal.cpp'
193--- plugins/Dash/verticaljournal.cpp 2015-09-14 09:11:08 +0000
194+++ plugins/Dash/verticaljournal.cpp 2015-10-08 09:07:28 +0000
195@@ -237,11 +237,7 @@
196 }
197 }
198
199-#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))
200-void VerticalJournal::processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes)
201-#else
202 void VerticalJournal::processModelRemoves(const QVector<QQmlChangeSet::Change> &removes)
203-#endif
204 {
205 Q_FOREACH(const QQmlChangeSet::Change &remove, removes) {
206 for (int i = remove.count - 1; i >= 0; --i) {
207
208=== modified file 'plugins/Dash/verticaljournal.h'
209--- plugins/Dash/verticaljournal.h 2014-11-26 10:09:06 +0000
210+++ plugins/Dash/verticaljournal.h 2015-10-08 09:07:28 +0000
211@@ -90,11 +90,7 @@
212 void calculateImplicitHeight() override;
213 void doRelayout() override;
214 void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;
215-#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0))
216- void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) override;
217-#else
218 void processModelRemoves(const QVector<QQmlChangeSet::Change> &removes) override;
219-#endif
220
221 QVector<QList<ViewItem>> m_columnVisibleItems;
222 QHash<int, int> m_indexColumnMap;
223
224=== modified file 'qml/Components/Background.qml'
225--- qml/Components/Background.qml 2015-10-08 09:07:28 +0000
226+++ qml/Components/Background.qml 2015-10-08 09:07:28 +0000
227@@ -14,7 +14,7 @@
228 * along with this program. If not, see <http://www.gnu.org/licenses/>.
229 */
230
231-import QtQuick 2.0
232+import QtQuick 2.4
233 import Ubuntu.Components 1.2
234 import Utils 0.1 as Utils
235
236
237=== modified file 'qml/Components/BaseCarouselDelegate.qml'
238--- qml/Components/BaseCarouselDelegate.qml 2015-10-08 09:07:28 +0000
239+++ qml/Components/BaseCarouselDelegate.qml 2015-10-08 09:07:28 +0000
240@@ -14,7 +14,7 @@
241 * along with this program. If not, see <http://www.gnu.org/licenses/>.
242 */
243
244-import QtQuick 2.0
245+import QtQuick 2.4
246 import Ubuntu.Components 1.2
247
248 /*!
249
250=== modified file 'qml/Components/Carousel.qml'
251--- qml/Components/Carousel.qml 2015-10-08 09:07:28 +0000
252+++ qml/Components/Carousel.qml 2015-10-08 09:07:28 +0000
253@@ -14,7 +14,7 @@
254 * along with this program. If not, see <http://www.gnu.org/licenses/>.
255 */
256
257-import QtQuick 2.3
258+import QtQuick 2.4
259 import Ubuntu.Components 1.2
260 import "carousel.js" as CarouselJS
261
262
263=== modified file 'qml/Components/Circle.qml'
264--- qml/Components/Circle.qml 2013-06-05 22:03:08 +0000
265+++ qml/Components/Circle.qml 2015-10-08 09:07:28 +0000
266@@ -14,7 +14,7 @@
267 * along with this program. If not, see <http://www.gnu.org/licenses/>.
268 */
269
270-import QtQuick 2.0
271+import QtQuick 2.4
272
273 Rectangle {
274 antialiasing: true
275
276=== modified file 'qml/Components/DelayedLockscreen.qml'
277--- qml/Components/DelayedLockscreen.qml 2015-10-08 09:07:28 +0000
278+++ qml/Components/DelayedLockscreen.qml 2015-10-08 09:07:28 +0000
279@@ -14,7 +14,7 @@
280 * along with this program. If not, see <http://www.gnu.org/licenses/>.
281 */
282
283-import QtQuick 2.0
284+import QtQuick 2.4
285 import Ubuntu.Components 1.2
286 import "../Components"
287
288
289=== modified file 'qml/Components/Dialogs.qml'
290--- qml/Components/Dialogs.qml 2015-10-08 09:07:28 +0000
291+++ qml/Components/Dialogs.qml 2015-10-08 09:07:28 +0000
292@@ -14,7 +14,7 @@
293 * along with this program. If not, see <http://www.gnu.org/licenses/>.
294 */
295
296-import QtQuick 2.0
297+import QtQuick 2.4
298
299 import Unity.Application 0.1
300 import Unity.Session 0.1
301
302=== modified file 'qml/Components/DragHandle.qml'
303--- qml/Components/DragHandle.qml 2015-10-08 09:07:28 +0000
304+++ qml/Components/DragHandle.qml 2015-10-08 09:07:28 +0000
305@@ -14,7 +14,7 @@
306 * along with this program. If not, see <http://www.gnu.org/licenses/>.
307 */
308
309-import QtQuick 2.0
310+import QtQuick 2.4
311 import Ubuntu.Components 1.2
312 import Ubuntu.Gestures 0.1
313
314
315=== modified file 'qml/Components/DraggingArea.qml'
316--- qml/Components/DraggingArea.qml 2015-10-08 09:07:28 +0000
317+++ qml/Components/DraggingArea.qml 2015-10-08 09:07:28 +0000
318@@ -14,7 +14,7 @@
319 * along with this program. If not, see <http://www.gnu.org/licenses/>.
320 */
321
322-import QtQuick 2.0
323+import QtQuick 2.4
324 import Ubuntu.Components 1.2
325
326 MouseArea {
327
328=== modified file 'qml/Components/EdgeDragEvaluator.qml'
329--- qml/Components/EdgeDragEvaluator.qml 2015-10-08 09:07:28 +0000
330+++ qml/Components/EdgeDragEvaluator.qml 2015-10-08 09:07:28 +0000
331@@ -14,7 +14,7 @@
332 * along with this program. If not, see <http://www.gnu.org/licenses/>.
333 */
334
335-import QtQuick 2.0
336+import QtQuick 2.4
337 import Ubuntu.Components 1.2
338 import Ubuntu.Gestures 0.1
339
340
341=== modified file 'qml/Components/InputMethod.qml'
342--- qml/Components/InputMethod.qml 2015-10-08 09:07:28 +0000
343+++ qml/Components/InputMethod.qml 2015-10-08 09:07:28 +0000
344@@ -14,7 +14,7 @@
345 * along with this program. If not, see <http://www.gnu.org/licenses/>.
346 */
347
348-import QtQuick 2.0
349+import QtQuick 2.4
350 import Unity.Application 0.1
351 import Ubuntu.Components 1.2
352 import Ubuntu.Gestures 0.1
353
354=== modified file 'qml/Components/LazyImage.qml'
355--- qml/Components/LazyImage.qml 2015-10-08 09:07:28 +0000
356+++ qml/Components/LazyImage.qml 2015-10-08 09:07:28 +0000
357@@ -17,7 +17,7 @@
358 * along with this program. If not, see <http://www.gnu.org/licenses/>.
359 */
360
361-import QtQuick 2.0
362+import QtQuick 2.4
363 import Ubuntu.Components 1.2
364
365 Item {
366
367=== modified file 'qml/Components/ListItems/Header.qml'
368--- qml/Components/ListItems/Header.qml 2015-10-08 09:07:28 +0000
369+++ qml/Components/ListItems/Header.qml 2015-10-08 09:07:28 +0000
370@@ -14,7 +14,7 @@
371 * along with this program. If not, see <http://www.gnu.org/licenses/>.
372 */
373
374-import QtQuick 2.0
375+import QtQuick 2.4
376 import QtQuick.Layouts 1.1
377 import Ubuntu.Components 1.2
378
379
380=== modified file 'qml/Components/ListItems/ThinDivider.qml'
381--- qml/Components/ListItems/ThinDivider.qml 2013-06-27 09:50:24 +0000
382+++ qml/Components/ListItems/ThinDivider.qml 2015-10-08 09:07:28 +0000
383@@ -14,7 +14,7 @@
384 * along with this program. If not, see <http://www.gnu.org/licenses/>.
385 */
386
387-import QtQuick 2.0
388+import QtQuick 2.4
389
390 Image {
391 anchors {
392
393=== modified file 'qml/Components/Lockscreen.qml'
394--- qml/Components/Lockscreen.qml 2015-10-08 09:07:28 +0000
395+++ qml/Components/Lockscreen.qml 2015-10-08 09:07:28 +0000
396@@ -14,7 +14,7 @@
397 * along with this program. If not, see <http://www.gnu.org/licenses/>.
398 */
399
400-import QtQuick 2.0
401+import QtQuick 2.4
402 import Ubuntu.Components 1.2
403 import Ubuntu.Components.Popups 1.2
404 import Ubuntu.Telephony 0.1 as Telephony
405
406=== modified file 'qml/Components/PanelState/PanelState.qml'
407--- qml/Components/PanelState/PanelState.qml 2014-11-24 11:21:38 +0000
408+++ qml/Components/PanelState/PanelState.qml 2015-10-08 09:07:28 +0000
409@@ -15,7 +15,7 @@
410 */
411
412 pragma Singleton
413-import QtQuick 2.0
414+import QtQuick 2.4
415
416 QtObject {
417 id: root
418
419=== modified file 'qml/Components/PassphraseLockscreen.qml'
420--- qml/Components/PassphraseLockscreen.qml 2015-10-08 09:07:28 +0000
421+++ qml/Components/PassphraseLockscreen.qml 2015-10-08 09:07:28 +0000
422@@ -14,7 +14,7 @@
423 * along with this program. If not, see <http://www.gnu.org/licenses/>.
424 */
425
426-import QtQuick 2.0
427+import QtQuick 2.4
428 import Ubuntu.Components 1.2
429 import "../Components"
430
431
432=== modified file 'qml/Components/PhysicalKeysMapper.qml'
433--- qml/Components/PhysicalKeysMapper.qml 2015-09-02 09:30:32 +0000
434+++ qml/Components/PhysicalKeysMapper.qml 2015-10-08 09:07:28 +0000
435@@ -14,7 +14,7 @@
436 * along with this program. If not, see <http://www.gnu.org/licenses/>.
437 */
438
439-import QtQuick 2.0
440+import QtQuick 2.4
441 import Powerd 0.1
442
443 /*!
444
445=== modified file 'qml/Components/PinLockscreen.qml'
446--- qml/Components/PinLockscreen.qml 2015-10-08 09:07:28 +0000
447+++ qml/Components/PinLockscreen.qml 2015-10-08 09:07:28 +0000
448@@ -14,7 +14,7 @@
449 * along with this program. If not, see <http://www.gnu.org/licenses/>.
450 */
451
452-import QtQuick 2.0
453+import QtQuick 2.4
454 import Ubuntu.Components 1.2
455 import Ubuntu.Components.ListItems 1.2
456 import "../Components"
457
458=== modified file 'qml/Components/PinPadButton.qml'
459--- qml/Components/PinPadButton.qml 2015-10-08 09:07:28 +0000
460+++ qml/Components/PinPadButton.qml 2015-10-08 09:07:28 +0000
461@@ -14,7 +14,7 @@
462 * along with this program. If not, see <http://www.gnu.org/licenses/>.
463 */
464
465-import QtQuick 2.0
466+import QtQuick 2.4
467 import Ubuntu.Components 1.2
468
469 AbstractButton {
470
471=== modified file 'qml/Components/Rating.qml'
472--- qml/Components/Rating.qml 2015-10-08 09:07:28 +0000
473+++ qml/Components/Rating.qml 2015-10-08 09:07:28 +0000
474@@ -14,7 +14,7 @@
475 * along with this program. If not, see <http://www.gnu.org/licenses/>.
476 */
477
478-import QtQuick 2.0
479+import QtQuick 2.4
480 import Ubuntu.Components 1.2
481
482 /*! Rating widget bar. */
483
484=== modified file 'qml/Components/RatingStyle.qml'
485--- qml/Components/RatingStyle.qml 2015-10-08 09:07:28 +0000
486+++ qml/Components/RatingStyle.qml 2015-10-08 09:07:28 +0000
487@@ -14,7 +14,7 @@
488 * along with this program. If not, see <http://www.gnu.org/licenses/>.
489 */
490
491-import QtQuick 2.0
492+import QtQuick 2.4
493 import Ubuntu.Components 1.2
494
495 Row {
496
497=== modified file 'qml/Components/ResponsiveGridView.qml'
498--- qml/Components/ResponsiveGridView.qml 2015-10-08 09:07:28 +0000
499+++ qml/Components/ResponsiveGridView.qml 2015-10-08 09:07:28 +0000
500@@ -14,7 +14,7 @@
501 * along with this program. If not, see <http://www.gnu.org/licenses/>.
502 */
503
504-import QtQuick 2.3
505+import QtQuick 2.4
506 import Ubuntu.Components 1.2
507
508 /*
509
510=== modified file 'qml/Components/ResponsiveVerticalJournal.qml'
511--- qml/Components/ResponsiveVerticalJournal.qml 2015-10-08 09:07:28 +0000
512+++ qml/Components/ResponsiveVerticalJournal.qml 2015-10-08 09:07:28 +0000
513@@ -14,7 +14,7 @@
514 * along with this program. If not, see <http://www.gnu.org/licenses/>.
515 */
516
517-import QtQuick 2.0
518+import QtQuick 2.4
519 import Ubuntu.Components 1.2
520 import "../Components"
521 import Dash 0.1
522
523=== modified file 'qml/Components/ScreenGrabber.qml'
524--- qml/Components/ScreenGrabber.qml 2015-08-24 15:39:53 +0000
525+++ qml/Components/ScreenGrabber.qml 2015-10-08 09:07:28 +0000
526@@ -14,7 +14,7 @@
527 * along with this program. If not, see <http://www.gnu.org/licenses/>.
528 */
529
530-import QtQuick 2.0
531+import QtQuick 2.4
532 import QtMultimedia 5.0
533 import ScreenGrabber 0.1
534 import GlobalShortcut 1.0
535
536=== modified file 'qml/Components/ScrollCalculator.qml'
537--- qml/Components/ScrollCalculator.qml 2015-10-08 09:07:28 +0000
538+++ qml/Components/ScrollCalculator.qml 2015-10-08 09:07:28 +0000
539@@ -14,7 +14,7 @@
540 * along with this program. If not, see <http://www.gnu.org/licenses/>.
541 */
542
543-import QtQuick 2.2
544+import QtQuick 2.4
545 import Ubuntu.Components 1.2
546
547 Item {
548
549=== modified file 'qml/Components/SearchHistoryModel/SearchHistoryModel.qml'
550--- qml/Components/SearchHistoryModel/SearchHistoryModel.qml 2014-07-03 10:06:28 +0000
551+++ qml/Components/SearchHistoryModel/SearchHistoryModel.qml 2015-10-08 09:07:28 +0000
552@@ -15,7 +15,7 @@
553 */
554
555 pragma Singleton
556-import QtQuick 2.0
557+import QtQuick 2.4
558
559 // TODO sanitize input, move to persistent storage
560
561
562=== modified file 'qml/Components/ShellDialog.qml'
563--- qml/Components/ShellDialog.qml 2015-10-08 09:07:28 +0000
564+++ qml/Components/ShellDialog.qml 2015-10-08 09:07:28 +0000
565@@ -14,7 +14,7 @@
566 * along with this program. If not, see <http://www.gnu.org/licenses/>.
567 */
568
569-import QtQuick 2.0
570+import QtQuick 2.4
571
572 import Ubuntu.Components 1.2
573 import Ubuntu.Components.Popups 1.2
574
575=== modified file 'qml/Components/Showable.qml'
576--- qml/Components/Showable.qml 2014-12-08 12:21:11 +0000
577+++ qml/Components/Showable.qml 2015-10-08 09:07:28 +0000
578@@ -14,7 +14,7 @@
579 * along with this program. If not, see <http://www.gnu.org/licenses/>.
580 */
581
582-import QtQuick 2.0
583+import QtQuick 2.4
584
585 Item {
586 id: showable
587
588=== modified file 'qml/Components/StandardAnimation.qml'
589--- qml/Components/StandardAnimation.qml 2013-06-05 22:03:08 +0000
590+++ qml/Components/StandardAnimation.qml 2015-10-08 09:07:28 +0000
591@@ -14,7 +14,7 @@
592 * along with this program. If not, see <http://www.gnu.org/licenses/>.
593 */
594
595-import QtQuick 2.0
596+import QtQuick 2.4
597
598 NumberAnimation {
599 duration: 200
600
601=== modified file 'qml/Components/UbuntuShapeForItem.qml'
602--- qml/Components/UbuntuShapeForItem.qml 2015-10-08 09:07:28 +0000
603+++ qml/Components/UbuntuShapeForItem.qml 2015-10-08 09:07:28 +0000
604@@ -14,7 +14,7 @@
605 * along with this program. If not, see <http://www.gnu.org/licenses/>.
606 */
607
608-import QtQuick 2.0
609+import QtQuick 2.4
610 import Ubuntu.Components 1.2
611
612 /* FIXME: This component is duplicating the UbuntuShape from the SDK, but shapes more
613
614=== modified file 'qml/Components/Unity8Settings.qml'
615--- qml/Components/Unity8Settings.qml 2015-06-19 18:19:33 +0000
616+++ qml/Components/Unity8Settings.qml 2015-10-08 09:07:28 +0000
617@@ -14,7 +14,7 @@
618 * along with this program. If not, see <http://www.gnu.org/licenses/>.
619 */
620
621-import QtQuick 2.0
622+import QtQuick 2.4
623 import GSettings 1.0
624
625 QtObject {
626
627=== modified file 'qml/Components/UnityInputInfo/UnityInputInfo.qml'
628--- qml/Components/UnityInputInfo/UnityInputInfo.qml 2015-08-11 11:23:32 +0000
629+++ qml/Components/UnityInputInfo/UnityInputInfo.qml 2015-10-08 09:07:28 +0000
630@@ -16,7 +16,7 @@
631
632 pragma Singleton
633
634-import QtQuick 2.3
635+import QtQuick 2.4
636 import Unity.InputInfo 0.1
637 // Workaround https://bugs.launchpad.net/ubuntu/+source/unity8/+bug/1473471
638 import Ubuntu.Components 1.2
639
640=== modified file 'qml/Components/WindowControlButtons.qml'
641--- qml/Components/WindowControlButtons.qml 2015-10-08 09:07:28 +0000
642+++ qml/Components/WindowControlButtons.qml 2015-10-08 09:07:28 +0000
643@@ -16,7 +16,7 @@
644 * Authors: Michael Zanetti <michael.zanetti@canonical.com>
645 */
646
647-import QtQuick 2.3
648+import QtQuick 2.4
649 import Ubuntu.Components 1.2
650
651 Row {
652
653=== modified file 'qml/Components/WindowScreenshot.qml'
654--- qml/Components/WindowScreenshot.qml 2015-03-06 04:44:11 +0000
655+++ qml/Components/WindowScreenshot.qml 2015-10-08 09:07:28 +0000
656@@ -14,7 +14,7 @@
657 * along with this program. If not, see <http://www.gnu.org/licenses/>.
658 */
659
660-import QtQuick 2.2
661+import QtQuick 2.4
662
663 Item {
664 id: root
665
666=== modified file 'qml/Components/WrongPasswordAnimation.qml'
667--- qml/Components/WrongPasswordAnimation.qml 2013-06-27 14:05:15 +0000
668+++ qml/Components/WrongPasswordAnimation.qml 2015-10-08 09:07:28 +0000
669@@ -14,7 +14,7 @@
670 * along with this program. If not, see <http://www.gnu.org/licenses/>.
671 */
672
673-import QtQuick 2.0
674+import QtQuick 2.4
675
676 SequentialAnimation {
677 id: root
678
679=== modified file 'qml/Components/ZoomableImage.qml'
680--- qml/Components/ZoomableImage.qml 2015-10-08 09:07:28 +0000
681+++ qml/Components/ZoomableImage.qml 2015-10-08 09:07:28 +0000
682@@ -14,7 +14,7 @@
683 * along with this program. If not, see <http://www.gnu.org/licenses/>.
684 */
685
686-import QtQuick 2.0
687+import QtQuick 2.4
688 import Ubuntu.Components 1.2
689 import "../Components"
690
691
692=== modified file 'qml/Dash/CardCarousel.qml'
693--- qml/Dash/CardCarousel.qml 2015-10-08 09:07:28 +0000
694+++ qml/Dash/CardCarousel.qml 2015-10-08 09:07:28 +0000
695@@ -14,7 +14,7 @@
696 * along with this program. If not, see <http://www.gnu.org/licenses/>.
697 */
698
699-import QtQuick 2.0
700+import QtQuick 2.4
701 import Ubuntu.Components 1.2
702 import "../Components"
703
704
705=== modified file 'qml/Dash/CardGrid.qml'
706--- qml/Dash/CardGrid.qml 2015-05-13 10:21:18 +0000
707+++ qml/Dash/CardGrid.qml 2015-10-08 09:07:28 +0000
708@@ -14,7 +14,7 @@
709 * along with this program. If not, see <http://www.gnu.org/licenses/>.
710 */
711
712-import QtQuick 2.0
713+import QtQuick 2.4
714 import "../Components"
715
716 DashRenderer {
717
718=== modified file 'qml/Dash/CardHorizontalList.qml'
719--- qml/Dash/CardHorizontalList.qml 2015-10-08 09:07:28 +0000
720+++ qml/Dash/CardHorizontalList.qml 2015-10-08 09:07:28 +0000
721@@ -14,7 +14,7 @@
722 * along with this program. If not, see <http://www.gnu.org/licenses/>.
723 */
724
725-import QtQuick 2.3
726+import QtQuick 2.4
727 import Ubuntu.Components 1.2
728 import "../Components"
729
730
731=== modified file 'qml/Dash/CardTool.qml'
732--- qml/Dash/CardTool.qml 2015-09-01 08:38:39 +0000
733+++ qml/Dash/CardTool.qml 2015-10-08 09:07:28 +0000
734@@ -14,7 +14,7 @@
735 * along with this program. If not, see <http://www.gnu.org/licenses/>.
736 */
737
738-import QtQuick 2.0
739+import QtQuick 2.4
740 import Dash 0.1
741
742 /*!
743
744=== modified file 'qml/Dash/CardVerticalJournal.qml'
745--- qml/Dash/CardVerticalJournal.qml 2015-10-08 09:07:28 +0000
746+++ qml/Dash/CardVerticalJournal.qml 2015-10-08 09:07:28 +0000
747@@ -14,7 +14,7 @@
748 * along with this program. If not, see <http://www.gnu.org/licenses/>.
749 */
750
751-import QtQuick 2.0
752+import QtQuick 2.4
753 import Ubuntu.Components 1.2
754 import "../Components"
755
756
757=== modified file 'qml/Dash/Dash.qml'
758--- qml/Dash/Dash.qml 2015-10-08 09:07:28 +0000
759+++ qml/Dash/Dash.qml 2015-10-08 09:07:28 +0000
760@@ -14,7 +14,7 @@
761 * along with this program. If not, see <http://www.gnu.org/licenses/>.
762 */
763
764-import QtQuick 2.2
765+import QtQuick 2.4
766 import Ubuntu.Components 1.2
767 import Ubuntu.Gestures 0.1
768 import Unity 0.2
769
770=== modified file 'qml/Dash/DashApplication.qml'
771--- qml/Dash/DashApplication.qml 2015-10-08 09:07:28 +0000
772+++ qml/Dash/DashApplication.qml 2015-10-08 09:07:28 +0000
773@@ -14,7 +14,7 @@
774 * along with this program. If not, see <http://www.gnu.org/licenses/>.
775 */
776
777-import QtQuick 2.2
778+import QtQuick 2.4
779 import Ubuntu.Components 1.2
780 import Ubuntu.Thumbnailer 0.1 // Register support for image://thumbnailer/ and image://albumart/
781
782
783=== modified file 'qml/Dash/DashBackground.qml'
784--- qml/Dash/DashBackground.qml 2015-04-13 18:28:54 +0000
785+++ qml/Dash/DashBackground.qml 2015-10-08 09:07:28 +0000
786@@ -14,7 +14,7 @@
787 * along with this program. If not, see <http://www.gnu.org/licenses/>.
788 */
789
790-import QtQuick 2.0
791+import QtQuick 2.4
792
793 Image {
794 source: anchors.fill.width > anchors.fill.height ? "graphics/paper_landscape.png" : "graphics/paper_portrait.png"
795
796=== modified file 'qml/Dash/DashCategoryBase.qml'
797--- qml/Dash/DashCategoryBase.qml 2015-10-08 09:07:28 +0000
798+++ qml/Dash/DashCategoryBase.qml 2015-10-08 09:07:28 +0000
799@@ -14,7 +14,7 @@
800 * along with this program. If not, see <http://www.gnu.org/licenses/>.
801 */
802
803-import QtQuick 2.0
804+import QtQuick 2.4
805 import Ubuntu.Components 1.2
806
807 Item {
808
809=== modified file 'qml/Dash/DashContent.qml'
810--- qml/Dash/DashContent.qml 2015-10-08 09:07:28 +0000
811+++ qml/Dash/DashContent.qml 2015-10-08 09:07:28 +0000
812@@ -14,7 +14,7 @@
813 * along with this program. If not, see <http://www.gnu.org/licenses/>.
814 */
815
816-import QtQuick 2.0
817+import QtQuick 2.4
818 import Ubuntu.Components 1.2
819 import Unity 0.2
820 import Utils 0.1
821
822=== modified file 'qml/Dash/DashNavigation.qml'
823--- qml/Dash/DashNavigation.qml 2015-10-08 09:07:28 +0000
824+++ qml/Dash/DashNavigation.qml 2015-10-08 09:07:28 +0000
825@@ -14,7 +14,7 @@
826 * along with this program. If not, see <http://www.gnu.org/licenses/>.
827 */
828
829-import QtQuick 2.2
830+import QtQuick 2.4
831 import Ubuntu.Components 1.2
832 import Dash 0.1
833 import "../Components"
834
835=== modified file 'qml/Dash/DashNavigationButton.qml'
836--- qml/Dash/DashNavigationButton.qml 2015-10-08 09:07:28 +0000
837+++ qml/Dash/DashNavigationButton.qml 2015-10-08 09:07:28 +0000
838@@ -14,7 +14,7 @@
839 * along with this program. If not, see <http://www.gnu.org/licenses/>.
840 */
841
842-import QtQuick 2.2
843+import QtQuick 2.4
844 import Ubuntu.Components 1.2
845
846 AbstractButton {
847
848=== modified file 'qml/Dash/DashNavigationList.qml'
849--- qml/Dash/DashNavigationList.qml 2015-10-08 09:07:28 +0000
850+++ qml/Dash/DashNavigationList.qml 2015-10-08 09:07:28 +0000
851@@ -14,7 +14,7 @@
852 * along with this program. If not, see <http://www.gnu.org/licenses/>.
853 */
854
855-import QtQuick 2.2
856+import QtQuick 2.4
857 import Ubuntu.Components 1.2
858 import Ubuntu.Components.ListItems 1.2 as ListItem
859 import "../Components"
860
861=== modified file 'qml/Dash/DashRenderer.qml'
862--- qml/Dash/DashRenderer.qml 2015-01-14 09:51:39 +0000
863+++ qml/Dash/DashRenderer.qml 2015-10-08 09:07:28 +0000
864@@ -14,7 +14,7 @@
865 * along with this program. If not, see <http://www.gnu.org/licenses/>.
866 */
867
868-import QtQuick 2.0
869+import QtQuick 2.4
870
871 Item {
872 property real collapsedHeight
873
874=== modified file 'qml/Dash/GenericScopeView.qml'
875--- qml/Dash/GenericScopeView.qml 2015-10-08 09:07:28 +0000
876+++ qml/Dash/GenericScopeView.qml 2015-10-08 09:07:28 +0000
877@@ -14,7 +14,7 @@
878 * along with this program. If not, see <http://www.gnu.org/licenses/>.
879 */
880
881-import QtQuick 2.0
882+import QtQuick 2.4
883 import Ubuntu.Components 1.2
884 import Utils 0.1
885 import Unity 0.2
886
887=== modified file 'qml/Dash/PageHeader.qml'
888--- qml/Dash/PageHeader.qml 2015-10-08 09:07:28 +0000
889+++ qml/Dash/PageHeader.qml 2015-10-08 09:07:28 +0000
890@@ -14,7 +14,7 @@
891 * along with this program. If not, see <http://www.gnu.org/licenses/>.
892 */
893
894-import QtQuick 2.2
895+import QtQuick 2.4
896 import Ubuntu.Components 1.2
897 import Ubuntu.Components.Themes.Ambiance 1.2
898 import Ubuntu.Components.Popups 1.2
899
900=== modified file 'qml/Dash/PreviewListView.qml'
901--- qml/Dash/PreviewListView.qml 2015-10-08 09:07:28 +0000
902+++ qml/Dash/PreviewListView.qml 2015-10-08 09:07:28 +0000
903@@ -14,7 +14,7 @@
904 * along with this program. If not, see <http://www.gnu.org/licenses/>.
905 */
906
907-import QtQuick 2.0
908+import QtQuick 2.4
909 import Ubuntu.Components 1.2
910 import Unity 0.2
911 import "../Components"
912
913=== modified file 'qml/Dash/Previews/Preview.qml'
914--- qml/Dash/Previews/Preview.qml 2015-10-08 09:07:28 +0000
915+++ qml/Dash/Previews/Preview.qml 2015-10-08 09:07:28 +0000
916@@ -14,7 +14,7 @@
917 * along with this program. If not, see <http://www.gnu.org/licenses/>.
918 */
919
920-import QtQuick 2.0
921+import QtQuick 2.4
922 import Ubuntu.Components 1.2
923
924 /*! \brief This component constructs the Preview UI.
925
926=== modified file 'qml/Dash/Previews/PreviewActionButton.qml'
927--- qml/Dash/Previews/PreviewActionButton.qml 2015-10-08 09:07:28 +0000
928+++ qml/Dash/Previews/PreviewActionButton.qml 2015-10-08 09:07:28 +0000
929@@ -14,7 +14,7 @@
930 * along with this program. If not, see <http://www.gnu.org/licenses/>.
931 */
932
933-import QtQuick 2.0
934+import QtQuick 2.4
935 import Ubuntu.Components 1.2
936
937 Button {
938
939=== modified file 'qml/Dash/Previews/PreviewActionCombo.qml'
940--- qml/Dash/Previews/PreviewActionCombo.qml 2015-10-08 09:07:28 +0000
941+++ qml/Dash/Previews/PreviewActionCombo.qml 2015-10-08 09:07:28 +0000
942@@ -14,7 +14,7 @@
943 * along with this program. If not, see <http://www.gnu.org/licenses/>.
944 */
945
946-import QtQuick 2.0
947+import QtQuick 2.4
948 import Ubuntu.Components 1.2
949
950 Item {
951
952=== modified file 'qml/Dash/Previews/PreviewActions.qml'
953--- qml/Dash/Previews/PreviewActions.qml 2015-10-08 09:07:28 +0000
954+++ qml/Dash/Previews/PreviewActions.qml 2015-10-08 09:07:28 +0000
955@@ -14,7 +14,7 @@
956 * along with this program. If not, see <http://www.gnu.org/licenses/>.
957 */
958
959-import QtQuick 2.1
960+import QtQuick 2.4
961 import Ubuntu.Components 1.2
962
963 /*! This preview widget shows either one button, two buttons or one button
964
965=== modified file 'qml/Dash/Previews/PreviewAudioPlayback.qml'
966--- qml/Dash/Previews/PreviewAudioPlayback.qml 2015-10-08 09:07:28 +0000
967+++ qml/Dash/Previews/PreviewAudioPlayback.qml 2015-10-08 09:07:28 +0000
968@@ -14,7 +14,7 @@
969 * along with this program. If not, see <http://www.gnu.org/licenses/>.
970 */
971
972-import QtQuick 2.0
973+import QtQuick 2.4
974 import QtMultimedia 5.0
975 import Ubuntu.Components 1.2
976
977
978=== modified file 'qml/Dash/Previews/PreviewComment.qml'
979--- qml/Dash/Previews/PreviewComment.qml 2015-07-06 15:33:11 +0000
980+++ qml/Dash/Previews/PreviewComment.qml 2015-10-08 09:07:28 +0000
981@@ -14,7 +14,7 @@
982 * along with this program. If not, see <http://www.gnu.org/licenses/>.
983 */
984
985-import QtQuick 2.0
986+import QtQuick 2.4
987 import Ubuntu.Components 1.2
988
989 /*! \brief Preview widget for comments.
990
991=== modified file 'qml/Dash/Previews/PreviewCommentInput.qml'
992--- qml/Dash/Previews/PreviewCommentInput.qml 2015-10-08 09:07:28 +0000
993+++ qml/Dash/Previews/PreviewCommentInput.qml 2015-10-08 09:07:28 +0000
994@@ -14,7 +14,7 @@
995 * along with this program. If not, see <http://www.gnu.org/licenses/>.
996 */
997
998-import QtQuick 2.0
999+import QtQuick 2.4
1000 import Ubuntu.Components 1.2
1001 import "../../Components"
1002
1003
1004=== modified file 'qml/Dash/Previews/PreviewExpandable.qml'
1005--- qml/Dash/Previews/PreviewExpandable.qml 2015-10-08 09:07:28 +0000
1006+++ qml/Dash/Previews/PreviewExpandable.qml 2015-10-08 09:07:28 +0000
1007@@ -14,7 +14,7 @@
1008 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1009 */
1010
1011-import QtQuick 2.3
1012+import QtQuick 2.4
1013 import Ubuntu.Components 1.2
1014 import "../../Components"
1015
1016
1017=== modified file 'qml/Dash/Previews/PreviewHeader.qml'
1018--- qml/Dash/Previews/PreviewHeader.qml 2015-10-08 09:07:28 +0000
1019+++ qml/Dash/Previews/PreviewHeader.qml 2015-10-08 09:07:28 +0000
1020@@ -14,7 +14,7 @@
1021 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1022 */
1023
1024-import QtQuick 2.0
1025+import QtQuick 2.4
1026 import Ubuntu.Components 1.2
1027 import Dash 0.1
1028 import "../"
1029
1030=== modified file 'qml/Dash/Previews/PreviewIconActions.qml'
1031--- qml/Dash/Previews/PreviewIconActions.qml 2015-10-08 09:07:28 +0000
1032+++ qml/Dash/Previews/PreviewIconActions.qml 2015-10-08 09:07:28 +0000
1033@@ -14,7 +14,7 @@
1034 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1035 */
1036
1037-import QtQuick 2.1
1038+import QtQuick 2.4
1039 import Ubuntu.Components 1.2
1040
1041 /*! This preview widget icons+label for number of items in widgetData["actions"].
1042
1043=== modified file 'qml/Dash/Previews/PreviewImageGallery.qml'
1044--- qml/Dash/Previews/PreviewImageGallery.qml 2015-10-08 09:07:28 +0000
1045+++ qml/Dash/Previews/PreviewImageGallery.qml 2015-10-08 09:07:28 +0000
1046@@ -14,7 +14,7 @@
1047 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1048 */
1049
1050-import QtQuick 2.0
1051+import QtQuick 2.4
1052 import Ubuntu.Components 1.2
1053 import "../../Components"
1054
1055
1056=== modified file 'qml/Dash/Previews/PreviewOverlay.qml'
1057--- qml/Dash/Previews/PreviewOverlay.qml 2015-10-08 09:07:28 +0000
1058+++ qml/Dash/Previews/PreviewOverlay.qml 2015-10-08 09:07:28 +0000
1059@@ -14,7 +14,7 @@
1060 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1061 */
1062
1063-import QtQuick 2.0
1064+import QtQuick 2.4
1065 import Ubuntu.Components 1.2
1066 import "../../Components"
1067
1068
1069=== modified file 'qml/Dash/Previews/PreviewPayments.qml'
1070--- qml/Dash/Previews/PreviewPayments.qml 2015-10-08 09:07:28 +0000
1071+++ qml/Dash/Previews/PreviewPayments.qml 2015-10-08 09:07:28 +0000
1072@@ -14,7 +14,7 @@
1073 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1074 */
1075
1076-import QtQuick 2.1
1077+import QtQuick 2.4
1078 import Ubuntu.Components 1.2
1079 import Ubuntu.Payments 0.1
1080
1081
1082=== modified file 'qml/Dash/Previews/PreviewProgress.qml'
1083--- qml/Dash/Previews/PreviewProgress.qml 2015-10-08 09:07:28 +0000
1084+++ qml/Dash/Previews/PreviewProgress.qml 2015-10-08 09:07:28 +0000
1085@@ -14,7 +14,7 @@
1086 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1087 */
1088
1089-import QtQuick 2.1
1090+import QtQuick 2.4
1091 import Ubuntu.Components 1.2
1092 import Ubuntu.DownloadDaemonListener 0.1
1093
1094
1095=== modified file 'qml/Dash/Previews/PreviewRatingDisplay.qml'
1096--- qml/Dash/Previews/PreviewRatingDisplay.qml 2015-10-08 09:07:28 +0000
1097+++ qml/Dash/Previews/PreviewRatingDisplay.qml 2015-10-08 09:07:28 +0000
1098@@ -14,7 +14,7 @@
1099 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1100 */
1101
1102-import QtQuick 2.0
1103+import QtQuick 2.4
1104 import Ubuntu.Components 1.2
1105 import "../../Components"
1106
1107
1108=== modified file 'qml/Dash/Previews/PreviewRatingInput.qml'
1109--- qml/Dash/Previews/PreviewRatingInput.qml 2015-10-08 09:07:28 +0000
1110+++ qml/Dash/Previews/PreviewRatingInput.qml 2015-10-08 09:07:28 +0000
1111@@ -14,7 +14,7 @@
1112 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1113 */
1114
1115-import QtQuick 2.0
1116+import QtQuick 2.4
1117 import Ubuntu.Components 1.2
1118 import "../../Components"
1119
1120
1121=== modified file 'qml/Dash/Previews/PreviewTable.qml'
1122--- qml/Dash/Previews/PreviewTable.qml 2015-10-08 09:07:28 +0000
1123+++ qml/Dash/Previews/PreviewTable.qml 2015-10-08 09:07:28 +0000
1124@@ -14,7 +14,7 @@
1125 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1126 */
1127
1128-import QtQuick 2.0
1129+import QtQuick 2.4
1130 import QtQuick.Layouts 1.1
1131 import Ubuntu.Components 1.2
1132 import "../../Components"
1133
1134=== modified file 'qml/Dash/Previews/PreviewTextSummary.qml'
1135--- qml/Dash/Previews/PreviewTextSummary.qml 2015-10-08 09:07:28 +0000
1136+++ qml/Dash/Previews/PreviewTextSummary.qml 2015-10-08 09:07:28 +0000
1137@@ -14,7 +14,7 @@
1138 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1139 */
1140
1141-import QtQuick 2.0
1142+import QtQuick 2.4
1143 import Ubuntu.Components 1.2
1144 import "../../Components"
1145
1146
1147=== modified file 'qml/Dash/Previews/PreviewVideoPlayback.qml'
1148--- qml/Dash/Previews/PreviewVideoPlayback.qml 2015-10-08 09:07:28 +0000
1149+++ qml/Dash/Previews/PreviewVideoPlayback.qml 2015-10-08 09:07:28 +0000
1150@@ -14,7 +14,7 @@
1151 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1152 */
1153
1154-import QtQuick 2.0
1155+import QtQuick 2.4
1156 import Ubuntu.Components 1.2
1157 import Ubuntu.Thumbnailer 0.1
1158 import "../../Components"
1159
1160=== modified file 'qml/Dash/Previews/PreviewWidget.qml'
1161--- qml/Dash/Previews/PreviewWidget.qml 2015-08-31 10:40:59 +0000
1162+++ qml/Dash/Previews/PreviewWidget.qml 2015-10-08 09:07:28 +0000
1163@@ -14,7 +14,7 @@
1164 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1165 */
1166
1167-import QtQuick 2.0
1168+import QtQuick 2.4
1169
1170 /*! Interface for preview widgets. */
1171
1172
1173=== modified file 'qml/Dash/Previews/PreviewWidgetFactory.qml'
1174--- qml/Dash/Previews/PreviewWidgetFactory.qml 2015-09-15 12:05:09 +0000
1175+++ qml/Dash/Previews/PreviewWidgetFactory.qml 2015-10-08 09:07:28 +0000
1176@@ -15,7 +15,7 @@
1177 *
1178 */
1179
1180-import QtQuick 2.0
1181+import QtQuick 2.4
1182
1183 //! \brief This component loads the widgets based on widgetData["type"].
1184
1185
1186=== modified file 'qml/Dash/Previews/PreviewZoomableImage.qml'
1187--- qml/Dash/Previews/PreviewZoomableImage.qml 2015-10-08 09:07:28 +0000
1188+++ qml/Dash/Previews/PreviewZoomableImage.qml 2015-10-08 09:07:28 +0000
1189@@ -14,7 +14,7 @@
1190 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1191 */
1192
1193-import QtQuick 2.0
1194+import QtQuick 2.4
1195 import Ubuntu.Components 1.2
1196 import "../../Components"
1197
1198
1199=== modified file 'qml/Dash/PullToRefreshScopeStyle.qml'
1200--- qml/Dash/PullToRefreshScopeStyle.qml 2015-10-08 09:07:28 +0000
1201+++ qml/Dash/PullToRefreshScopeStyle.qml 2015-10-08 09:07:28 +0000
1202@@ -14,7 +14,7 @@
1203 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1204 */
1205
1206-import QtQuick 2.3
1207+import QtQuick 2.4
1208 import Ubuntu.Components 1.2
1209 import Ubuntu.Components.Styles 1.2
1210
1211
1212=== modified file 'qml/Dash/ScopeListView.qml'
1213--- qml/Dash/ScopeListView.qml 2014-12-03 11:06:10 +0000
1214+++ qml/Dash/ScopeListView.qml 2015-10-08 09:07:28 +0000
1215@@ -14,7 +14,7 @@
1216 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1217 */
1218
1219-import QtQuick 2.0
1220+import QtQuick 2.4
1221 import Dash 0.1
1222
1223 ListViewWithPageHeader {
1224
1225=== modified file 'qml/Dash/ScopeSettings/ScopeSetting.qml'
1226--- qml/Dash/ScopeSettings/ScopeSetting.qml 2015-10-08 09:07:28 +0000
1227+++ qml/Dash/ScopeSettings/ScopeSetting.qml 2015-10-08 09:07:28 +0000
1228@@ -14,7 +14,7 @@
1229 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1230 */
1231
1232-import QtQuick 2.2
1233+import QtQuick 2.4
1234 import Ubuntu.Components 1.2
1235
1236 /*! Interface for settings widgets. */
1237
1238=== modified file 'qml/Dash/ScopeSettings/ScopeSettingBoolean.qml'
1239--- qml/Dash/ScopeSettings/ScopeSettingBoolean.qml 2015-10-08 09:07:28 +0000
1240+++ qml/Dash/ScopeSettings/ScopeSettingBoolean.qml 2015-10-08 09:07:28 +0000
1241@@ -14,7 +14,7 @@
1242 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1243 */
1244
1245-import QtQuick 2.2
1246+import QtQuick 2.4
1247 import Ubuntu.Components 1.2
1248 import Ubuntu.Components.ListItems 1.2 as ListItem
1249
1250
1251=== modified file 'qml/Dash/ScopeSettings/ScopeSettingList.qml'
1252--- qml/Dash/ScopeSettings/ScopeSettingList.qml 2015-10-08 09:07:28 +0000
1253+++ qml/Dash/ScopeSettings/ScopeSettingList.qml 2015-10-08 09:07:28 +0000
1254@@ -14,7 +14,7 @@
1255 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1256 */
1257
1258-import QtQuick 2.2
1259+import QtQuick 2.4
1260 import Ubuntu.Components 1.2
1261 import Ubuntu.Components.ListItems 1.2 as ListItem
1262
1263
1264=== modified file 'qml/Dash/ScopeSettings/ScopeSettingNumber.qml'
1265--- qml/Dash/ScopeSettings/ScopeSettingNumber.qml 2014-08-18 11:34:58 +0000
1266+++ qml/Dash/ScopeSettings/ScopeSettingNumber.qml 2015-10-08 09:07:28 +0000
1267@@ -14,7 +14,7 @@
1268 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1269 */
1270
1271-import QtQuick 2.2
1272+import QtQuick 2.4
1273
1274 ScopeSettingString {
1275 mode: "number"
1276
1277=== modified file 'qml/Dash/ScopeSettings/ScopeSettingString.qml'
1278--- qml/Dash/ScopeSettings/ScopeSettingString.qml 2015-10-08 09:07:28 +0000
1279+++ qml/Dash/ScopeSettings/ScopeSettingString.qml 2015-10-08 09:07:28 +0000
1280@@ -14,7 +14,7 @@
1281 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1282 */
1283
1284-import QtQuick 2.2
1285+import QtQuick 2.4
1286 import Ubuntu.Components 1.2
1287 import Ubuntu.Components.ListItems 1.2 as ListItem
1288
1289
1290=== modified file 'qml/Dash/ScopeSettings/ScopeSettingsWidgetFactory.qml'
1291--- qml/Dash/ScopeSettings/ScopeSettingsWidgetFactory.qml 2014-08-26 12:33:32 +0000
1292+++ qml/Dash/ScopeSettings/ScopeSettingsWidgetFactory.qml 2015-10-08 09:07:28 +0000
1293@@ -14,7 +14,7 @@
1294 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1295 */
1296
1297-import QtQuick 2.2
1298+import QtQuick 2.4
1299
1300 //! \brief This component loads the widgets based on type.
1301
1302
1303=== modified file 'qml/Dash/ScopeSettingsPage.qml'
1304--- qml/Dash/ScopeSettingsPage.qml 2015-10-08 09:07:28 +0000
1305+++ qml/Dash/ScopeSettingsPage.qml 2015-10-08 09:07:28 +0000
1306@@ -14,7 +14,7 @@
1307 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1308 */
1309
1310-import QtQuick 2.2
1311+import QtQuick 2.4
1312 import Ubuntu.Components 1.2
1313 import Unity 0.2
1314 import "../Components"
1315
1316=== modified file 'qml/Dash/ScopesList.qml'
1317--- qml/Dash/ScopesList.qml 2015-07-08 09:55:58 +0000
1318+++ qml/Dash/ScopesList.qml 2015-10-08 09:07:28 +0000
1319@@ -14,7 +14,7 @@
1320 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1321 */
1322
1323-import QtQuick 2.3
1324+import QtQuick 2.4
1325 import Dash 0.1
1326
1327 Item {
1328
1329=== modified file 'qml/Dash/ScopesListCategory.qml'
1330--- qml/Dash/ScopesListCategory.qml 2015-10-08 09:07:28 +0000
1331+++ qml/Dash/ScopesListCategory.qml 2015-10-08 09:07:28 +0000
1332@@ -14,7 +14,7 @@
1333 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1334 */
1335
1336-import QtQuick 2.3
1337+import QtQuick 2.4
1338 import Ubuntu.Components 1.2
1339 import Dash 0.1
1340 import "../Components/ListItems" as ListItems
1341
1342=== modified file 'qml/Dash/ScopesListCategoryItem.qml'
1343--- qml/Dash/ScopesListCategoryItem.qml 2015-10-08 09:07:28 +0000
1344+++ qml/Dash/ScopesListCategoryItem.qml 2015-10-08 09:07:28 +0000
1345@@ -14,7 +14,7 @@
1346 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1347 */
1348
1349-import QtQuick 2.3
1350+import QtQuick 2.4
1351 import QtQuick.Layouts 1.1
1352 import Ubuntu.Components 1.2
1353
1354
1355=== modified file 'qml/DeviceConfiguration.qml'
1356--- qml/DeviceConfiguration.qml 2015-07-01 17:52:34 +0000
1357+++ qml/DeviceConfiguration.qml 2015-10-08 09:07:28 +0000
1358@@ -14,7 +14,7 @@
1359 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1360 */
1361
1362-import QtQuick 2.0
1363+import QtQuick 2.4
1364
1365 StateGroup {
1366 id: root
1367
1368=== modified file 'qml/Greeter/Clock.qml'
1369--- qml/Greeter/Clock.qml 2015-10-08 09:07:28 +0000
1370+++ qml/Greeter/Clock.qml 2015-10-08 09:07:28 +0000
1371@@ -14,7 +14,7 @@
1372 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1373 */
1374
1375-import QtQuick 2.0
1376+import QtQuick 2.4
1377 import Ubuntu.Components 1.2
1378 import "../Panel/Indicators"
1379 import Unity.Indicators 0.1 as Indicators
1380
1381=== modified file 'qml/Greeter/CoverPage.qml'
1382--- qml/Greeter/CoverPage.qml 2015-10-08 09:07:28 +0000
1383+++ qml/Greeter/CoverPage.qml 2015-10-08 09:07:28 +0000
1384@@ -14,7 +14,7 @@
1385 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1386 */
1387
1388-import QtQuick 2.3
1389+import QtQuick 2.4
1390 import Ubuntu.Components 1.2
1391 import Ubuntu.Gestures 0.1
1392 import "../Components"
1393
1394=== modified file 'qml/Greeter/Dot.qml'
1395--- qml/Greeter/Dot.qml 2013-06-05 22:03:08 +0000
1396+++ qml/Greeter/Dot.qml 2015-10-08 09:07:28 +0000
1397@@ -14,7 +14,7 @@
1398 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1399 */
1400
1401-import QtQuick 2.0
1402+import QtQuick 2.4
1403
1404 Image {
1405 states: [
1406
1407=== modified file 'qml/Greeter/Greeter.qml'
1408--- qml/Greeter/Greeter.qml 2015-10-08 09:07:28 +0000
1409+++ qml/Greeter/Greeter.qml 2015-10-08 09:07:28 +0000
1410@@ -14,7 +14,7 @@
1411 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1412 */
1413
1414-import QtQuick 2.3
1415+import QtQuick 2.4
1416 import AccountsService 0.1
1417 import GSettings 1.0
1418 import Ubuntu.Components 1.2
1419
1420=== modified file 'qml/Greeter/Infographics.qml'
1421--- qml/Greeter/Infographics.qml 2015-10-08 09:07:28 +0000
1422+++ qml/Greeter/Infographics.qml 2015-10-08 09:07:28 +0000
1423@@ -16,7 +16,7 @@
1424
1425 import "../Components"
1426 import "Gradient.js" as Gradient
1427-import QtQuick 2.0
1428+import QtQuick 2.4
1429 import Ubuntu.Components 1.2
1430
1431 Item {
1432
1433=== modified file 'qml/Greeter/IntegratedLightDMImpl.qml'
1434--- qml/Greeter/IntegratedLightDMImpl.qml 2015-06-06 02:23:50 +0000
1435+++ qml/Greeter/IntegratedLightDMImpl.qml 2015-10-08 09:07:28 +0000
1436@@ -14,7 +14,7 @@
1437 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1438 */
1439
1440-import QtQuick 2.3
1441+import QtQuick 2.4
1442 import IntegratedLightDM 0.1 as LightDM
1443
1444 Item{
1445
1446=== modified file 'qml/Greeter/LightDM.qml'
1447--- qml/Greeter/LightDM.qml 2015-06-08 14:29:42 +0000
1448+++ qml/Greeter/LightDM.qml 2015-10-08 09:07:28 +0000
1449@@ -19,7 +19,7 @@
1450 * plugin
1451 */
1452
1453-import QtQuick 2.3
1454+import QtQuick 2.4
1455
1456 Loader {
1457 id: loader
1458
1459=== modified file 'qml/Greeter/LoginList.qml'
1460--- qml/Greeter/LoginList.qml 2015-10-08 09:07:28 +0000
1461+++ qml/Greeter/LoginList.qml 2015-10-08 09:07:28 +0000
1462@@ -14,7 +14,7 @@
1463 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1464 */
1465
1466-import QtQuick 2.3
1467+import QtQuick 2.4
1468 import Ubuntu.Components 1.2
1469 import "../Components"
1470
1471
1472=== modified file 'qml/Greeter/NarrowView.qml'
1473--- qml/Greeter/NarrowView.qml 2015-10-08 09:07:28 +0000
1474+++ qml/Greeter/NarrowView.qml 2015-10-08 09:07:28 +0000
1475@@ -14,7 +14,7 @@
1476 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1477 */
1478
1479-import QtQuick 2.3
1480+import QtQuick 2.4
1481 import Ubuntu.Components 1.2
1482 import "../Components"
1483
1484
1485=== modified file 'qml/Greeter/ObjectPositioner.qml'
1486--- qml/Greeter/ObjectPositioner.qml 2015-10-08 09:07:28 +0000
1487+++ qml/Greeter/ObjectPositioner.qml 2015-10-08 09:07:28 +0000
1488@@ -14,7 +14,7 @@
1489 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1490 */
1491
1492-import QtQuick 2.0
1493+import QtQuick 2.4
1494 import Ubuntu.Components 1.2
1495
1496 Item {
1497
1498=== modified file 'qml/Greeter/ShimGreeter.qml'
1499--- qml/Greeter/ShimGreeter.qml 2015-04-22 23:55:23 +0000
1500+++ qml/Greeter/ShimGreeter.qml 2015-10-08 09:07:28 +0000
1501@@ -14,7 +14,7 @@
1502 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1503 */
1504
1505-import QtQuick 2.3
1506+import QtQuick 2.4
1507
1508 /*
1509 * This is a shim greeter that is only used to provide a shell,
1510
1511=== modified file 'qml/Greeter/WideView.qml'
1512--- qml/Greeter/WideView.qml 2015-10-08 09:07:28 +0000
1513+++ qml/Greeter/WideView.qml 2015-10-08 09:07:28 +0000
1514@@ -14,7 +14,7 @@
1515 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1516 */
1517
1518-import QtQuick 2.3
1519+import QtQuick 2.4
1520 import Ubuntu.Components 1.2
1521
1522 FocusScope {
1523
1524=== modified file 'qml/Launcher/FoldingLauncherDelegate.qml'
1525--- qml/Launcher/FoldingLauncherDelegate.qml 2015-10-08 09:07:28 +0000
1526+++ qml/Launcher/FoldingLauncherDelegate.qml 2015-10-08 09:07:28 +0000
1527@@ -14,7 +14,7 @@
1528 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1529 */
1530
1531-import QtQuick 2.0
1532+import QtQuick 2.4
1533 import Ubuntu.Components 1.2
1534
1535 LauncherDelegate {
1536
1537=== modified file 'qml/Launcher/Launcher.qml'
1538--- qml/Launcher/Launcher.qml 2015-10-08 09:07:28 +0000
1539+++ qml/Launcher/Launcher.qml 2015-10-08 09:07:28 +0000
1540@@ -14,7 +14,7 @@
1541 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1542 */
1543
1544-import QtQuick 2.0
1545+import QtQuick 2.4
1546 import "../Components"
1547 import Ubuntu.Components 1.2
1548 import Ubuntu.Gestures 0.1
1549
1550=== modified file 'qml/Launcher/LauncherDelegate.qml'
1551--- qml/Launcher/LauncherDelegate.qml 2015-10-08 09:07:28 +0000
1552+++ qml/Launcher/LauncherDelegate.qml 2015-10-08 09:07:28 +0000
1553@@ -14,7 +14,7 @@
1554 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1555 */
1556
1557-import QtQuick 2.0
1558+import QtQuick 2.4
1559 import Ubuntu.Components 1.2
1560
1561 Item {
1562
1563=== modified file 'qml/Launcher/LauncherPanel.qml'
1564--- qml/Launcher/LauncherPanel.qml 2015-10-08 09:07:28 +0000
1565+++ qml/Launcher/LauncherPanel.qml 2015-10-08 09:07:28 +0000
1566@@ -14,7 +14,7 @@
1567 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1568 */
1569
1570-import QtQuick 2.3
1571+import QtQuick 2.4
1572 import Ubuntu.Components 1.2
1573 import Ubuntu.Components.ListItems 1.2 as ListItems
1574 import Unity.Launcher 0.1
1575
1576=== modified file 'qml/Notifications/Notification.qml'
1577--- qml/Notifications/Notification.qml 2015-10-08 09:07:28 +0000
1578+++ qml/Notifications/Notification.qml 2015-10-08 09:07:28 +0000
1579@@ -14,7 +14,7 @@
1580 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1581 */
1582
1583-import QtQuick 2.0
1584+import QtQuick 2.4
1585 import QtMultimedia 5.0
1586 import Powerd 0.1
1587 import Ubuntu.Components 1.2
1588
1589=== modified file 'qml/Notifications/NotificationMenuItemFactory.qml'
1590--- qml/Notifications/NotificationMenuItemFactory.qml 2015-10-08 09:07:28 +0000
1591+++ qml/Notifications/NotificationMenuItemFactory.qml 2015-10-08 09:07:28 +0000
1592@@ -17,7 +17,7 @@
1593 * Nick Dedekind <nick.dedekind@canonical.com>
1594 */
1595
1596-import QtQuick 2.0
1597+import QtQuick 2.4
1598 import Ubuntu.Components 1.2
1599 import QMenuModel 0.1
1600 import "../Components"
1601
1602=== modified file 'qml/Notifications/Notifications.qml'
1603--- qml/Notifications/Notifications.qml 2015-10-08 09:07:28 +0000
1604+++ qml/Notifications/Notifications.qml 2015-10-08 09:07:28 +0000
1605@@ -14,7 +14,7 @@
1606 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1607 */
1608
1609-import QtQuick 2.0
1610+import QtQuick 2.4
1611 import Ubuntu.Components 1.2
1612 import Unity.Notifications 1.0 as UnityNotifications
1613 import Utils 0.1
1614
1615=== modified file 'qml/Notifications/OptionToggle.qml'
1616--- qml/Notifications/OptionToggle.qml 2015-10-08 09:07:28 +0000
1617+++ qml/Notifications/OptionToggle.qml 2015-10-08 09:07:28 +0000
1618@@ -14,7 +14,7 @@
1619 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1620 */
1621
1622-import QtQuick 2.0
1623+import QtQuick 2.4
1624 import Ubuntu.Components 1.2
1625 import Ubuntu.Components.ListItems 1.2 as ListItem
1626 import Ubuntu.Components.Popups 1.2
1627
1628=== modified file 'qml/Notifications/ShapedIcon.qml'
1629--- qml/Notifications/ShapedIcon.qml 2015-05-08 14:09:26 +0000
1630+++ qml/Notifications/ShapedIcon.qml 2015-10-08 09:07:28 +0000
1631@@ -14,7 +14,7 @@
1632 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1633 */
1634
1635-import QtQuick 2.3
1636+import QtQuick 2.4
1637 import Ubuntu.Components 1.2
1638
1639 Item {
1640
1641=== modified file 'qml/Notifications/SwipeToAct.qml'
1642--- qml/Notifications/SwipeToAct.qml 2015-09-22 14:39:02 +0000
1643+++ qml/Notifications/SwipeToAct.qml 2015-10-08 09:07:28 +0000
1644@@ -14,7 +14,7 @@
1645 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1646 */
1647
1648-import QtQuick 2.3
1649+import QtQuick 2.4
1650 import Ubuntu.Components 1.2
1651
1652 Item {
1653
1654=== modified file 'qml/OrientedShell.qml'
1655--- qml/OrientedShell.qml 2015-09-22 14:23:44 +0000
1656+++ qml/OrientedShell.qml 2015-10-08 09:07:28 +0000
1657@@ -14,8 +14,8 @@
1658 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1659 */
1660
1661-import QtQuick 2.0
1662-import QtQuick.Window 2.0
1663+import QtQuick 2.4
1664+import QtQuick.Window 2.2
1665 import Unity.Session 0.1
1666 import GSettings 1.0
1667 import "Components"
1668
1669=== modified file 'qml/Panel/ActiveCallHint.qml'
1670--- qml/Panel/ActiveCallHint.qml 2015-10-08 09:07:28 +0000
1671+++ qml/Panel/ActiveCallHint.qml 2015-10-08 09:07:28 +0000
1672@@ -14,7 +14,7 @@
1673 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1674 */
1675
1676-import QtQuick 2.0
1677+import QtQuick 2.4
1678 import Ubuntu.Telephony 0.1 as Telephony
1679 import Ubuntu.Components 1.2
1680 import Unity.Application 0.1
1681
1682=== modified file 'qml/Panel/Handle.qml'
1683--- qml/Panel/Handle.qml 2015-10-08 09:07:28 +0000
1684+++ qml/Panel/Handle.qml 2015-10-08 09:07:28 +0000
1685@@ -14,7 +14,7 @@
1686 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1687 */
1688
1689-import QtQuick 2.2
1690+import QtQuick 2.4
1691 import Ubuntu.Components 1.2
1692
1693 Rectangle {
1694
1695=== modified file 'qml/Panel/IndicatorItem.qml'
1696--- qml/Panel/IndicatorItem.qml 2015-10-08 09:07:28 +0000
1697+++ qml/Panel/IndicatorItem.qml 2015-10-08 09:07:28 +0000
1698@@ -14,7 +14,7 @@
1699 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1700 */
1701
1702-import QtQuick 2.2
1703+import QtQuick 2.4
1704 import Ubuntu.Components 1.2
1705 import Ubuntu.Settings.Components 0.1
1706 import "Indicators"
1707
1708=== modified file 'qml/Panel/IndicatorItemRow.qml'
1709--- qml/Panel/IndicatorItemRow.qml 2015-10-08 09:07:28 +0000
1710+++ qml/Panel/IndicatorItemRow.qml 2015-10-08 09:07:28 +0000
1711@@ -14,7 +14,7 @@
1712 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1713 */
1714
1715-import QtQuick 2.2
1716+import QtQuick 2.4
1717 import Ubuntu.Components 1.2
1718
1719 Item {
1720
1721=== modified file 'qml/Panel/IndicatorPage.qml'
1722--- qml/Panel/IndicatorPage.qml 2015-10-08 09:07:28 +0000
1723+++ qml/Panel/IndicatorPage.qml 2015-10-08 09:07:28 +0000
1724@@ -14,7 +14,7 @@
1725 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1726 */
1727
1728-import QtQuick 2.0
1729+import QtQuick 2.4
1730 import Ubuntu.Components 1.2 as Components
1731 import Unity.Indicators 0.1 as Indicators
1732 import "Indicators"
1733
1734=== modified file 'qml/Panel/Indicators/IndicatorBase.qml'
1735--- qml/Panel/Indicators/IndicatorBase.qml 2015-07-01 11:08:59 +0000
1736+++ qml/Panel/Indicators/IndicatorBase.qml 2015-10-08 09:07:28 +0000
1737@@ -17,7 +17,7 @@
1738 * Nick Dedekind <nick.dedekind@canonical.com>
1739 */
1740
1741-import QtQuick 2.0
1742+import QtQuick 2.4
1743 import Unity.Indicators 0.1
1744
1745 Item {
1746
1747=== modified file 'qml/Panel/Indicators/IndicatorDelegate.qml'
1748--- qml/Panel/Indicators/IndicatorDelegate.qml 2015-09-15 22:50:16 +0000
1749+++ qml/Panel/Indicators/IndicatorDelegate.qml 2015-10-08 09:07:28 +0000
1750@@ -17,7 +17,7 @@
1751 * Nick Dedekind <nick.dedekind@canonical.com>
1752 */
1753
1754-import QtQuick 2.0
1755+import QtQuick 2.4
1756
1757 IndicatorBase {
1758 readonly property bool indicatorVisible: rootActionState.indicatorVisible
1759
1760=== modified file 'qml/Panel/Indicators/IndicatorsLight.qml'
1761--- qml/Panel/Indicators/IndicatorsLight.qml 2015-06-03 16:30:40 +0000
1762+++ qml/Panel/Indicators/IndicatorsLight.qml 2015-10-08 09:07:28 +0000
1763@@ -17,7 +17,7 @@
1764 * Renato Araujo Oliveira Filho <renato@canonical.com>
1765 */
1766
1767-import QtQuick 2.0
1768+import QtQuick 2.4
1769 import Powerd 0.1
1770 import Lights 0.1
1771 import QMenuModel 0.1 as QMenuModel
1772
1773=== modified file 'qml/Panel/Indicators/MenuItemFactory.qml'
1774--- qml/Panel/Indicators/MenuItemFactory.qml 2015-10-08 09:07:28 +0000
1775+++ qml/Panel/Indicators/MenuItemFactory.qml 2015-10-08 09:07:28 +0000
1776@@ -14,7 +14,7 @@
1777 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1778 */
1779
1780-import QtQuick 2.0
1781+import QtQuick 2.4
1782 import Ubuntu.Settings.Menus 0.1 as Menus
1783 import Ubuntu.Settings.Components 0.1
1784 import QMenuModel 0.1
1785
1786=== modified file 'qml/Panel/Indicators/MessageMenuItemFactory.qml'
1787--- qml/Panel/Indicators/MessageMenuItemFactory.qml 2015-10-08 09:07:28 +0000
1788+++ qml/Panel/Indicators/MessageMenuItemFactory.qml 2015-10-08 09:07:28 +0000
1789@@ -18,7 +18,7 @@
1790 * Olivier Tilloy <olivier.tilloy@canonical.com>
1791 */
1792
1793-import QtQuick 2.0
1794+import QtQuick 2.4
1795 import Ubuntu.Components 1.2
1796 import Ubuntu.Settings.Menus 0.1 as Menus
1797 import QMenuModel 0.1 as QMenuModel
1798
1799=== modified file 'qml/Panel/Indicators/ModemInfoItem.qml'
1800--- qml/Panel/Indicators/ModemInfoItem.qml 2015-10-08 09:07:28 +0000
1801+++ qml/Panel/Indicators/ModemInfoItem.qml 2015-10-08 09:07:28 +0000
1802@@ -14,7 +14,7 @@
1803 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1804 */
1805
1806-import QtQuick 2.0
1807+import QtQuick 2.4
1808 import QtQuick.Layouts 1.1
1809 import Ubuntu.Components 1.2
1810 import Ubuntu.Components.ListItems 1.2 as ListItem
1811
1812=== modified file 'qml/Panel/Indicators/RoamingIndication.qml'
1813--- qml/Panel/Indicators/RoamingIndication.qml 2015-10-08 09:07:28 +0000
1814+++ qml/Panel/Indicators/RoamingIndication.qml 2015-10-08 09:07:28 +0000
1815@@ -14,7 +14,7 @@
1816 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1817 */
1818
1819-import QtQuick 2.0
1820+import QtQuick 2.4
1821 import QtQuick.Layouts 1.1
1822 import Ubuntu.Components 1.2
1823
1824
1825=== modified file 'qml/Panel/Indicators/client/IndicatorRepresentation.qml'
1826--- qml/Panel/Indicators/client/IndicatorRepresentation.qml 2015-10-08 09:07:28 +0000
1827+++ qml/Panel/Indicators/client/IndicatorRepresentation.qml 2015-10-08 09:07:28 +0000
1828@@ -18,7 +18,7 @@
1829 * Nick Dedekind <nick.dedekind@canonical.com>
1830 */
1831
1832-import QtQuick 2.0
1833+import QtQuick 2.4
1834 import Ubuntu.Components 1.2
1835 import Ubuntu.Components.ListItems 1.2 as ListItem
1836 import "../.."
1837
1838=== modified file 'qml/Panel/Indicators/client/IndicatorsClient.qml'
1839--- qml/Panel/Indicators/client/IndicatorsClient.qml 2015-10-08 09:07:28 +0000
1840+++ qml/Panel/Indicators/client/IndicatorsClient.qml 2015-10-08 09:07:28 +0000
1841@@ -17,7 +17,7 @@
1842 * Renato Araujo Oliveira Filho <renato@canonical.com>
1843 */
1844
1845-import QtQuick 2.0
1846+import QtQuick 2.4
1847 import Ubuntu.Components 1.2
1848 import Ubuntu.Components.ListItems 1.2 as ListItem
1849
1850
1851=== modified file 'qml/Panel/Indicators/client/IndicatorsList.qml'
1852--- qml/Panel/Indicators/client/IndicatorsList.qml 2015-10-08 09:07:28 +0000
1853+++ qml/Panel/Indicators/client/IndicatorsList.qml 2015-10-08 09:07:28 +0000
1854@@ -17,7 +17,7 @@
1855 * Renato Araujo Oliveira Filho <renato@canonical.com>
1856 */
1857
1858-import QtQuick 2.0
1859+import QtQuick 2.4
1860 import Ubuntu.Components 1.2
1861 import Ubuntu.Components.ListItems 1.2 as ListItem
1862 import Unity.Indicators 0.1 as Indicators
1863
1864=== modified file 'qml/Panel/Indicators/client/IndicatorsTree.qml'
1865--- qml/Panel/Indicators/client/IndicatorsTree.qml 2015-10-08 09:07:28 +0000
1866+++ qml/Panel/Indicators/client/IndicatorsTree.qml 2015-10-08 09:07:28 +0000
1867@@ -17,7 +17,7 @@
1868 * Nick Dedekind <nick.dededkind@canonical.com>
1869 */
1870
1871-import QtQuick 2.0
1872+import QtQuick 2.4
1873 import Ubuntu.Components 1.2
1874 import Unity.Indicators 0.1 as Indicators
1875 import ".."
1876
1877=== modified file 'qml/Panel/IndicatorsBar.qml'
1878--- qml/Panel/IndicatorsBar.qml 2015-10-08 09:07:28 +0000
1879+++ qml/Panel/IndicatorsBar.qml 2015-10-08 09:07:28 +0000
1880@@ -14,7 +14,7 @@
1881 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1882 */
1883
1884-import QtQuick 2.2
1885+import QtQuick 2.4
1886 import Ubuntu.Components 1.2
1887 import "../Components"
1888
1889
1890=== modified file 'qml/Panel/IndicatorsMenu.qml'
1891--- qml/Panel/IndicatorsMenu.qml 2015-10-08 09:07:28 +0000
1892+++ qml/Panel/IndicatorsMenu.qml 2015-10-08 09:07:28 +0000
1893@@ -14,7 +14,7 @@
1894 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1895 */
1896
1897-import QtQuick 2.2
1898+import QtQuick 2.4
1899 import Ubuntu.Components 1.2
1900 import Ubuntu.Gestures 0.1
1901 import "../Components"
1902
1903=== modified file 'qml/Panel/MenuContent.qml'
1904--- qml/Panel/MenuContent.qml 2015-10-08 09:07:28 +0000
1905+++ qml/Panel/MenuContent.qml 2015-10-08 09:07:28 +0000
1906@@ -14,7 +14,7 @@
1907 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1908 */
1909
1910-import QtQuick 2.2
1911+import QtQuick 2.4
1912 import QtQuick.Layouts 1.1
1913 import Ubuntu.Components 1.2
1914 import Unity.Indicators 0.1 as Indicators
1915
1916=== modified file 'qml/Panel/Panel.qml'
1917--- qml/Panel/Panel.qml 2015-10-08 09:07:28 +0000
1918+++ qml/Panel/Panel.qml 2015-10-08 09:07:28 +0000
1919@@ -14,7 +14,7 @@
1920 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1921 */
1922
1923-import QtQuick 2.2
1924+import QtQuick 2.4
1925 import Ubuntu.Components 1.2
1926 import Unity.Application 0.1
1927 import "../Components"
1928
1929=== modified file 'qml/Panel/PanelBackground.qml'
1930--- qml/Panel/PanelBackground.qml 2013-06-05 22:03:08 +0000
1931+++ qml/Panel/PanelBackground.qml 2015-10-08 09:07:28 +0000
1932@@ -14,7 +14,7 @@
1933 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1934 */
1935
1936-import QtQuick 2.0
1937+import QtQuick 2.4
1938
1939 Rectangle {
1940 color: "black"
1941
1942=== modified file 'qml/Panel/PanelSeparatorLine.qml'
1943--- qml/Panel/PanelSeparatorLine.qml 2013-06-05 22:03:08 +0000
1944+++ qml/Panel/PanelSeparatorLine.qml 2015-10-08 09:07:28 +0000
1945@@ -14,7 +14,7 @@
1946 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1947 */
1948
1949-import QtQuick 2.0
1950+import QtQuick 2.4
1951
1952 Rectangle {
1953 property real saturation: 1.0
1954
1955=== modified file 'qml/Panel/PanelVelocityCalculator.qml'
1956--- qml/Panel/PanelVelocityCalculator.qml 2014-10-14 13:49:26 +0000
1957+++ qml/Panel/PanelVelocityCalculator.qml 2015-10-08 09:07:28 +0000
1958@@ -14,7 +14,7 @@
1959 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1960 */
1961
1962-import QtQuick 2.2
1963+import QtQuick 2.4
1964 import Ubuntu.Gestures 0.1
1965
1966 Item {
1967
1968=== modified file 'qml/Rotation/HalfLoopRotationAnimation.qml'
1969--- qml/Rotation/HalfLoopRotationAnimation.qml 2015-03-06 04:44:11 +0000
1970+++ qml/Rotation/HalfLoopRotationAnimation.qml 2015-10-08 09:07:28 +0000
1971@@ -14,7 +14,7 @@
1972 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1973 */
1974
1975-import QtQuick 2.3
1976+import QtQuick 2.4
1977
1978 SequentialAnimation {
1979 id: root
1980
1981=== modified file 'qml/Rotation/ImmediateRotationAction.qml'
1982--- qml/Rotation/ImmediateRotationAction.qml 2015-04-01 16:33:31 +0000
1983+++ qml/Rotation/ImmediateRotationAction.qml 2015-10-08 09:07:28 +0000
1984@@ -14,7 +14,7 @@
1985 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1986 */
1987
1988-import QtQuick 2.3
1989+import QtQuick 2.4
1990
1991 ScriptAction {
1992 property var info
1993
1994=== modified file 'qml/Rotation/NinetyRotationAnimation.qml'
1995--- qml/Rotation/NinetyRotationAnimation.qml 2015-03-06 04:44:11 +0000
1996+++ qml/Rotation/NinetyRotationAnimation.qml 2015-10-08 09:07:28 +0000
1997@@ -14,7 +14,7 @@
1998 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1999 */
2000
2001-import QtQuick 2.3
2002+import QtQuick 2.4
2003
2004 SequentialAnimation {
2005 id: root
2006
2007=== modified file 'qml/Rotation/RotationStates.qml'
2008--- qml/Rotation/RotationStates.qml 2015-10-08 09:07:28 +0000
2009+++ qml/Rotation/RotationStates.qml 2015-10-08 09:07:28 +0000
2010@@ -14,7 +14,7 @@
2011 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2012 */
2013
2014-import QtQuick 2.0
2015+import QtQuick 2.4
2016 import Ubuntu.Components 1.2
2017 import Powerd 0.1
2018
2019
2020=== modified file 'qml/ScopeTool.qml'
2021--- qml/ScopeTool.qml 2015-10-08 09:07:28 +0000
2022+++ qml/ScopeTool.qml 2015-10-08 09:07:28 +0000
2023@@ -14,7 +14,7 @@
2024 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2025 */
2026
2027-import QtQuick 2.0
2028+import QtQuick 2.4
2029 import Ubuntu.Components 1.2
2030 import Ubuntu.Components.Popups 1.2
2031 import Ubuntu.Thumbnailer 0.1 // Register support for image://thumbnailer/ and image://albumart/
2032
2033=== modified file 'qml/Shell.qml'
2034--- qml/Shell.qml 2015-10-08 09:07:28 +0000
2035+++ qml/Shell.qml 2015-10-08 09:07:28 +0000
2036@@ -14,8 +14,8 @@
2037 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2038 */
2039
2040-import QtQuick 2.0
2041-import QtQuick.Window 2.0
2042+import QtQuick 2.4
2043+import QtQuick.Window 2.2
2044 import AccountsService 0.1
2045 import GSettings 1.0
2046 import Unity.Application 0.1
2047
2048=== modified file 'qml/Stages/Animations/BaseSessionAnimation.qml'
2049--- qml/Stages/Animations/BaseSessionAnimation.qml 2014-09-02 15:51:20 +0000
2050+++ qml/Stages/Animations/BaseSessionAnimation.qml 2015-10-08 09:07:28 +0000
2051@@ -14,7 +14,7 @@
2052 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2053 */
2054
2055-import QtQuick 2.0
2056+import QtQuick 2.4
2057
2058 /* This is the base case for surface animations, used when adding/removing * child surfaces.
2059 * The class is meant to be overridden and changes/animations provided for state changes.
2060
2061=== modified file 'qml/Stages/Animations/SwipeFromBottomAnimation.qml'
2062--- qml/Stages/Animations/SwipeFromBottomAnimation.qml 2015-10-08 09:07:28 +0000
2063+++ qml/Stages/Animations/SwipeFromBottomAnimation.qml 2015-10-08 09:07:28 +0000
2064@@ -14,7 +14,7 @@
2065 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2066 */
2067
2068-import QtQuick 2.0
2069+import QtQuick 2.4
2070 import Ubuntu.Components 1.2
2071
2072 BaseSessionAnimation {
2073
2074=== modified file 'qml/Stages/ApplicationWindow.qml'
2075--- qml/Stages/ApplicationWindow.qml 2015-10-08 09:07:28 +0000
2076+++ qml/Stages/ApplicationWindow.qml 2015-10-08 09:07:28 +0000
2077@@ -14,7 +14,7 @@
2078 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2079 */
2080
2081-import QtQuick 2.0
2082+import QtQuick 2.4
2083 import Ubuntu.Components 1.2
2084 import Unity.Application 0.1
2085
2086
2087=== modified file 'qml/Stages/DecoratedWindow.qml'
2088--- qml/Stages/DecoratedWindow.qml 2015-10-08 09:07:28 +0000
2089+++ qml/Stages/DecoratedWindow.qml 2015-10-08 09:07:28 +0000
2090@@ -16,7 +16,7 @@
2091 * Authors: Michael Zanetti <michael.zanetti@canonical.com>
2092 */
2093
2094-import QtQuick 2.3
2095+import QtQuick 2.4
2096 import Ubuntu.Components 1.2
2097 import Unity.Application 0.1
2098
2099
2100=== modified file 'qml/Stages/DesktopSpreadDelegate.qml'
2101--- qml/Stages/DesktopSpreadDelegate.qml 2015-10-08 09:07:28 +0000
2102+++ qml/Stages/DesktopSpreadDelegate.qml 2015-10-08 09:07:28 +0000
2103@@ -16,7 +16,7 @@
2104 * Authors: Michael Zanetti <michael.zanetti@canonical.com>
2105 */
2106
2107-import QtQuick 2.3
2108+import QtQuick 2.4
2109 import Ubuntu.Components 1.2
2110 import Unity.Application 0.1
2111
2112
2113=== modified file 'qml/Stages/MainViewStyle.qml'
2114--- qml/Stages/MainViewStyle.qml 2015-10-08 09:07:28 +0000
2115+++ qml/Stages/MainViewStyle.qml 2015-10-08 09:07:28 +0000
2116@@ -13,7 +13,7 @@
2117 * You should have received a copy of the GNU Lesser General Public License
2118 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2119 */
2120-import QtQuick 2.0
2121+import QtQuick 2.4
2122 import Ubuntu.Components 1.2
2123
2124 // FIXME: copied with slight modifications from Ubuntu UI Toolkit's Ambiance's theme
2125
2126=== modified file 'qml/Stages/OrientationChangeAnimation.qml'
2127--- qml/Stages/OrientationChangeAnimation.qml 2015-04-24 09:53:37 +0000
2128+++ qml/Stages/OrientationChangeAnimation.qml 2015-10-08 09:07:28 +0000
2129@@ -14,7 +14,7 @@
2130 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2131 */
2132
2133-import QtQuick 2.3
2134+import QtQuick 2.4
2135
2136 QtObject {
2137 id: root
2138
2139=== modified file 'qml/Stages/PageHeadStyle.qml'
2140--- qml/Stages/PageHeadStyle.qml 2015-10-08 09:07:28 +0000
2141+++ qml/Stages/PageHeadStyle.qml 2015-10-08 09:07:28 +0000
2142@@ -13,7 +13,7 @@
2143 * You should have received a copy of the GNU Lesser General Public License
2144 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2145 */
2146-import QtQuick 2.2
2147+import QtQuick 2.4
2148 import Ubuntu.Components 1.2
2149 import Ubuntu.Components.Styles 1.2 as Style
2150
2151
2152=== modified file 'qml/Stages/PhoneStage.qml'
2153--- qml/Stages/PhoneStage.qml 2015-10-08 09:07:28 +0000
2154+++ qml/Stages/PhoneStage.qml 2015-10-08 09:07:28 +0000
2155@@ -14,7 +14,7 @@
2156 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2157 */
2158
2159-import QtQuick 2.2
2160+import QtQuick 2.4
2161 import Ubuntu.Components 1.2
2162 import Ubuntu.Gestures 0.1
2163 import Unity.Application 0.1
2164
2165=== modified file 'qml/Stages/SessionContainer.qml'
2166--- qml/Stages/SessionContainer.qml 2015-09-09 13:44:12 +0000
2167+++ qml/Stages/SessionContainer.qml 2015-10-08 09:07:28 +0000
2168@@ -14,7 +14,7 @@
2169 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2170 */
2171
2172-import QtQuick 2.0
2173+import QtQuick 2.4
2174 import "Animations"
2175
2176 FocusScope {
2177
2178=== modified file 'qml/Stages/ShimStage.qml'
2179--- qml/Stages/ShimStage.qml 2015-10-08 09:07:28 +0000
2180+++ qml/Stages/ShimStage.qml 2015-10-08 09:07:28 +0000
2181@@ -14,7 +14,7 @@
2182 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2183 */
2184
2185-import QtQuick 2.3
2186+import QtQuick 2.4
2187 import Ubuntu.Components 1.2
2188
2189 Rectangle {
2190
2191=== modified file 'qml/Stages/Splash.qml'
2192--- qml/Stages/Splash.qml 2015-10-08 09:07:28 +0000
2193+++ qml/Stages/Splash.qml 2015-10-08 09:07:28 +0000
2194@@ -14,7 +14,7 @@
2195 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2196 */
2197
2198-import QtQuick 2.2
2199+import QtQuick 2.4
2200 import Ubuntu.Components 1.2
2201 import Ubuntu.Components.Themes 0.1
2202 import "../Components"
2203@@ -64,7 +64,7 @@
2204 // FIXME: fake a Theme object as to expose the Palette corresponding to the backgroundColor (see MainViewStyle.qml)
2205 property var theme: QtObject {
2206 property string name
2207- property Palette palette: Qt.createQmlObject("import QtQuick 2.2;\
2208+ property Palette palette: Qt.createQmlObject("import QtQuick 2.4;\
2209 import Ubuntu.Components.Themes.%1 1.2;\
2210 Palette {}".arg(styledItem.theme.name),
2211 styledItem, "dynamicPalette");
2212
2213=== modified file 'qml/Stages/SpreadDelegate.qml'
2214--- qml/Stages/SpreadDelegate.qml 2015-10-08 09:07:28 +0000
2215+++ qml/Stages/SpreadDelegate.qml 2015-10-08 09:07:28 +0000
2216@@ -17,8 +17,8 @@
2217 * Daniel d'Andrada <daniel.dandrada@canonical.com>
2218 */
2219
2220-import QtQuick 2.0
2221-import QtQuick.Window 2.0
2222+import QtQuick 2.4
2223+import QtQuick.Window 2.2
2224 import Ubuntu.Components 1.2
2225 import "../Components"
2226
2227
2228=== modified file 'qml/Stages/SpreadMaths.qml'
2229--- qml/Stages/SpreadMaths.qml 2015-10-08 09:07:28 +0000
2230+++ qml/Stages/SpreadMaths.qml 2015-10-08 09:07:28 +0000
2231@@ -14,7 +14,7 @@
2232 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2233 */
2234
2235-import QtQuick 2.2
2236+import QtQuick 2.4
2237 import Ubuntu.Components 1.2
2238 import Utils 0.1
2239
2240
2241=== modified file 'qml/Stages/SurfaceContainer.qml'
2242--- qml/Stages/SurfaceContainer.qml 2015-10-08 09:07:28 +0000
2243+++ qml/Stages/SurfaceContainer.qml 2015-10-08 09:07:28 +0000
2244@@ -14,7 +14,7 @@
2245 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2246 */
2247
2248-import QtQuick 2.0
2249+import QtQuick 2.4
2250 import Ubuntu.Components 1.2
2251 import Ubuntu.Gestures 0.1 // For TouchGate
2252 import Utils 0.1 // for InputWatcher
2253
2254=== modified file 'qml/Stages/TabletStage.qml'
2255--- qml/Stages/TabletStage.qml 2015-10-08 09:07:28 +0000
2256+++ qml/Stages/TabletStage.qml 2015-10-08 09:07:28 +0000
2257@@ -14,7 +14,7 @@
2258 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2259 */
2260
2261-import QtQuick 2.0
2262+import QtQuick 2.4
2263 import Ubuntu.Components 1.2
2264 import Ubuntu.Gestures 0.1
2265 import Unity.Application 0.1
2266
2267=== modified file 'qml/Stages/TransformedSpreadDelegate.qml'
2268--- qml/Stages/TransformedSpreadDelegate.qml 2015-10-08 09:07:28 +0000
2269+++ qml/Stages/TransformedSpreadDelegate.qml 2015-10-08 09:07:28 +0000
2270@@ -16,7 +16,7 @@
2271 * Authors: Michael Zanetti <michael.zanetti@canonical.com>
2272 */
2273
2274-import QtQuick 2.0
2275+import QtQuick 2.4
2276 import Utils 0.1
2277 import Ubuntu.Components 1.2
2278
2279
2280=== modified file 'qml/Stages/TransformedTabletSpreadDelegate.qml'
2281--- qml/Stages/TransformedTabletSpreadDelegate.qml 2015-10-08 09:07:28 +0000
2282+++ qml/Stages/TransformedTabletSpreadDelegate.qml 2015-10-08 09:07:28 +0000
2283@@ -16,7 +16,7 @@
2284 * Authors: Michael Zanetti <michael.zanetti@canonical.com>
2285 */
2286
2287-import QtQuick 2.0
2288+import QtQuick 2.4
2289 import Utils 0.1
2290 import Ubuntu.Components 1.2
2291 import Unity.Application 0.1
2292
2293=== modified file 'qml/Stages/WindowDecoration.qml'
2294--- qml/Stages/WindowDecoration.qml 2015-10-08 09:07:28 +0000
2295+++ qml/Stages/WindowDecoration.qml 2015-10-08 09:07:28 +0000
2296@@ -16,7 +16,7 @@
2297 * Authors: Michael Zanetti <michael.zanetti@canonical.com>
2298 */
2299
2300-import QtQuick 2.3
2301+import QtQuick 2.4
2302 import Ubuntu.Components 1.2
2303 import "../Components"
2304
2305
2306=== modified file 'qml/Stages/WindowMoveResizeArea.qml'
2307--- qml/Stages/WindowMoveResizeArea.qml 2015-10-08 09:07:28 +0000
2308+++ qml/Stages/WindowMoveResizeArea.qml 2015-10-08 09:07:28 +0000
2309@@ -16,7 +16,7 @@
2310 * Authors: Michael Zanetti <michael.zanetti@canonical.com>
2311 */
2312
2313-import QtQuick 2.3
2314+import QtQuick 2.4
2315 import Ubuntu.Components 1.2
2316 import Utils 0.1
2317
2318
2319=== modified file 'qml/Tutorial/Arrow.qml'
2320--- qml/Tutorial/Arrow.qml 2015-10-08 09:07:28 +0000
2321+++ qml/Tutorial/Arrow.qml 2015-10-08 09:07:28 +0000
2322@@ -14,7 +14,7 @@
2323 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2324 */
2325
2326-import QtQuick 2.3
2327+import QtQuick 2.4
2328 import Ubuntu.Components 1.2
2329
2330 Item {
2331
2332=== modified file 'qml/Tutorial/Slider.qml'
2333--- qml/Tutorial/Slider.qml 2015-10-08 09:07:28 +0000
2334+++ qml/Tutorial/Slider.qml 2015-10-08 09:07:28 +0000
2335@@ -14,7 +14,7 @@
2336 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2337 */
2338
2339-import QtQuick 2.3
2340+import QtQuick 2.4
2341 import Ubuntu.Components 1.2
2342
2343 Item {
2344
2345=== modified file 'qml/Tutorial/Tick.qml'
2346--- qml/Tutorial/Tick.qml 2015-10-08 09:07:28 +0000
2347+++ qml/Tutorial/Tick.qml 2015-10-08 09:07:28 +0000
2348@@ -14,7 +14,7 @@
2349 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2350 */
2351
2352-import QtQuick 2.3
2353+import QtQuick 2.4
2354 import Ubuntu.Components 1.2
2355
2356 MouseArea {
2357
2358=== modified file 'qml/Tutorial/Tutorial.qml'
2359--- qml/Tutorial/Tutorial.qml 2015-10-08 09:07:28 +0000
2360+++ qml/Tutorial/Tutorial.qml 2015-10-08 09:07:28 +0000
2361@@ -14,7 +14,7 @@
2362 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2363 */
2364
2365-import QtQuick 2.3
2366+import QtQuick 2.4
2367 import Ubuntu.Components 1.2
2368
2369 Item {
2370
2371=== modified file 'qml/Tutorial/TutorialBottom.qml'
2372--- qml/Tutorial/TutorialBottom.qml 2015-10-08 09:07:28 +0000
2373+++ qml/Tutorial/TutorialBottom.qml 2015-10-08 09:07:28 +0000
2374@@ -14,7 +14,7 @@
2375 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2376 */
2377
2378-import QtQuick 2.3
2379+import QtQuick 2.4
2380 import Ubuntu.Components 1.2
2381 import Ubuntu.Gestures 0.1
2382 import "../Components"
2383
2384=== modified file 'qml/Tutorial/TutorialBottomFinish.qml'
2385--- qml/Tutorial/TutorialBottomFinish.qml 2015-10-08 09:07:28 +0000
2386+++ qml/Tutorial/TutorialBottomFinish.qml 2015-10-08 09:07:28 +0000
2387@@ -14,7 +14,7 @@
2388 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2389 */
2390
2391-import QtQuick 2.3
2392+import QtQuick 2.4
2393 import Ubuntu.Components 1.2
2394 import "." as LocalComponents
2395
2396
2397=== modified file 'qml/Tutorial/TutorialContent.qml'
2398--- qml/Tutorial/TutorialContent.qml 2015-10-08 09:07:28 +0000
2399+++ qml/Tutorial/TutorialContent.qml 2015-10-08 09:07:28 +0000
2400@@ -14,7 +14,7 @@
2401 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2402 */
2403
2404-import QtQuick 2.3
2405+import QtQuick 2.4
2406 import Ubuntu.Components 1.2
2407
2408 Item {
2409
2410=== modified file 'qml/Tutorial/TutorialLeft.qml'
2411--- qml/Tutorial/TutorialLeft.qml 2015-10-08 09:07:28 +0000
2412+++ qml/Tutorial/TutorialLeft.qml 2015-10-08 09:07:28 +0000
2413@@ -14,7 +14,7 @@
2414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2415 */
2416
2417-import QtQuick 2.3
2418+import QtQuick 2.4
2419 import Ubuntu.Components 1.2
2420 import "." as LocalComponents
2421
2422
2423=== modified file 'qml/Tutorial/TutorialLeftFinish.qml'
2424--- qml/Tutorial/TutorialLeftFinish.qml 2015-10-08 09:07:28 +0000
2425+++ qml/Tutorial/TutorialLeftFinish.qml 2015-10-08 09:07:28 +0000
2426@@ -14,7 +14,7 @@
2427 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2428 */
2429
2430-import QtQuick 2.3
2431+import QtQuick 2.4
2432 import Ubuntu.Components 1.2
2433 import "." as LocalComponents
2434
2435
2436=== modified file 'qml/Tutorial/TutorialPage.qml'
2437--- qml/Tutorial/TutorialPage.qml 2015-10-08 09:07:28 +0000
2438+++ qml/Tutorial/TutorialPage.qml 2015-10-08 09:07:28 +0000
2439@@ -14,7 +14,7 @@
2440 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2441 */
2442
2443-import QtQuick 2.3
2444+import QtQuick 2.4
2445 import Ubuntu.Components 1.2
2446 import "../Components"
2447
2448
2449=== modified file 'qml/Tutorial/TutorialRight.qml'
2450--- qml/Tutorial/TutorialRight.qml 2015-10-08 09:07:28 +0000
2451+++ qml/Tutorial/TutorialRight.qml 2015-10-08 09:07:28 +0000
2452@@ -14,7 +14,7 @@
2453 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2454 */
2455
2456-import QtQuick 2.3
2457+import QtQuick 2.4
2458 import Ubuntu.Components 1.2
2459 import Ubuntu.Gestures 0.1
2460 import Unity.Application 0.1
2461
2462=== modified file 'qml/Wizard/CheckableSetting.qml'
2463--- qml/Wizard/CheckableSetting.qml 2015-10-08 09:07:28 +0000
2464+++ qml/Wizard/CheckableSetting.qml 2015-10-08 09:07:28 +0000
2465@@ -14,7 +14,7 @@
2466 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2467 */
2468
2469-import QtQuick 2.3
2470+import QtQuick 2.4
2471 import Ubuntu.Components 1.2
2472 import Ubuntu.Components.ListItems 1.2 as ListItem
2473
2474
2475=== modified file 'qml/Wizard/Page.qml'
2476--- qml/Wizard/Page.qml 2015-10-08 09:07:28 +0000
2477+++ qml/Wizard/Page.qml 2015-10-08 09:07:28 +0000
2478@@ -14,7 +14,7 @@
2479 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2480 */
2481
2482-import QtQuick 2.3
2483+import QtQuick 2.4
2484 import Ubuntu.Components 1.2
2485
2486 Item {
2487
2488=== modified file 'qml/Wizard/Pages.qml'
2489--- qml/Wizard/Pages.qml 2015-10-08 09:07:28 +0000
2490+++ qml/Wizard/Pages.qml 2015-10-08 09:07:28 +0000
2491@@ -14,7 +14,7 @@
2492 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2493 */
2494
2495-import QtQuick 2.3
2496+import QtQuick 2.4
2497 import Ubuntu.Components 1.2
2498 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
2499 import Wizard 0.1
2500
2501=== modified file 'qml/Wizard/Pages/10-welcome.qml'
2502--- qml/Wizard/Pages/10-welcome.qml 2015-10-08 09:07:28 +0000
2503+++ qml/Wizard/Pages/10-welcome.qml 2015-10-08 09:07:28 +0000
2504@@ -14,7 +14,7 @@
2505 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2506 */
2507
2508-import QtQuick 2.3
2509+import QtQuick 2.4
2510 import Ubuntu.Components 1.2
2511 import Ubuntu.Components.ListItems 1.2
2512 import Ubuntu.SystemSettings.LanguagePlugin 1.0
2513
2514=== modified file 'qml/Wizard/Pages/20-sim.qml'
2515--- qml/Wizard/Pages/20-sim.qml 2015-10-08 09:07:28 +0000
2516+++ qml/Wizard/Pages/20-sim.qml 2015-10-08 09:07:28 +0000
2517@@ -14,7 +14,7 @@
2518 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2519 */
2520
2521-import QtQuick 2.0
2522+import QtQuick 2.4
2523 import MeeGo.QOfono 0.2
2524 import Ubuntu.Components 1.2
2525 import ".." as LocalComponents
2526
2527=== modified file 'qml/Wizard/Pages/30-passwd-type.qml'
2528--- qml/Wizard/Pages/30-passwd-type.qml 2015-10-08 09:07:28 +0000
2529+++ qml/Wizard/Pages/30-passwd-type.qml 2015-10-08 09:07:28 +0000
2530@@ -14,7 +14,7 @@
2531 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2532 */
2533
2534-import QtQuick 2.3
2535+import QtQuick 2.4
2536 import Ubuntu.Components 1.2
2537 import Ubuntu.Components.ListItems 1.2
2538 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
2539
2540=== modified file 'qml/Wizard/Pages/40-wifi.qml'
2541--- qml/Wizard/Pages/40-wifi.qml 2015-10-08 09:07:28 +0000
2542+++ qml/Wizard/Pages/40-wifi.qml 2015-10-08 09:07:28 +0000
2543@@ -14,7 +14,7 @@
2544 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2545 */
2546
2547-import QtQuick 2.0
2548+import QtQuick 2.4
2549 import QMenuModel 0.1 as QMenuModel
2550 import QtSystemInfo 5.0
2551 import Ubuntu.Components 1.2
2552
2553=== modified file 'qml/Wizard/Pages/50-location.qml'
2554--- qml/Wizard/Pages/50-location.qml 2015-10-08 09:07:28 +0000
2555+++ qml/Wizard/Pages/50-location.qml 2015-10-08 09:07:28 +0000
2556@@ -14,7 +14,7 @@
2557 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2558 */
2559
2560-import QtQuick 2.3
2561+import QtQuick 2.4
2562 import AccountsService 0.1
2563 import QMenuModel 0.1 as QMenuModel
2564 import Qt.labs.folderlistmodel 2.1
2565
2566=== modified file 'qml/Wizard/Pages/60-reporting.qml'
2567--- qml/Wizard/Pages/60-reporting.qml 2015-10-08 09:07:28 +0000
2568+++ qml/Wizard/Pages/60-reporting.qml 2015-10-08 09:07:28 +0000
2569@@ -14,7 +14,7 @@
2570 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2571 */
2572
2573-import QtQuick 2.0
2574+import QtQuick 2.4
2575 import Ubuntu.Components 1.2
2576 import Ubuntu.SystemSettings.Diagnostics 1.0
2577 import ".." as LocalComponents
2578
2579=== modified file 'qml/Wizard/Pages/80-finished.qml'
2580--- qml/Wizard/Pages/80-finished.qml 2015-10-08 09:07:28 +0000
2581+++ qml/Wizard/Pages/80-finished.qml 2015-10-08 09:07:28 +0000
2582@@ -14,7 +14,7 @@
2583 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2584 */
2585
2586-import QtQuick 2.0
2587+import QtQuick 2.4
2588 import Ubuntu.Components 1.2
2589 import ".." as LocalComponents
2590
2591
2592=== modified file 'qml/Wizard/Pages/here-terms.qml'
2593--- qml/Wizard/Pages/here-terms.qml 2015-10-08 09:07:28 +0000
2594+++ qml/Wizard/Pages/here-terms.qml 2015-10-08 09:07:28 +0000
2595@@ -14,7 +14,7 @@
2596 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2597 */
2598
2599-import QtQuick 2.3
2600+import QtQuick 2.4
2601 import AccountsService 0.1
2602 import Qt.labs.folderlistmodel 2.1
2603 import Ubuntu.Components 1.2
2604
2605=== modified file 'qml/Wizard/Pages/passwd-confirm.qml'
2606--- qml/Wizard/Pages/passwd-confirm.qml 2015-10-08 09:07:28 +0000
2607+++ qml/Wizard/Pages/passwd-confirm.qml 2015-10-08 09:07:28 +0000
2608@@ -14,7 +14,7 @@
2609 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2610 */
2611
2612-import QtQuick 2.3
2613+import QtQuick 2.4
2614 import Ubuntu.Components 1.2
2615 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
2616 import ".." as LocalComponents
2617
2618=== modified file 'qml/Wizard/Pages/passwd-set.qml'
2619--- qml/Wizard/Pages/passwd-set.qml 2015-10-08 09:07:28 +0000
2620+++ qml/Wizard/Pages/passwd-set.qml 2015-10-08 09:07:28 +0000
2621@@ -14,7 +14,7 @@
2622 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2623 */
2624
2625-import QtQuick 2.3
2626+import QtQuick 2.4
2627 import Ubuntu.Components 1.2
2628 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
2629 import ".." as LocalComponents
2630
2631=== modified file 'qml/Wizard/StackButton.qml'
2632--- qml/Wizard/StackButton.qml 2015-10-08 09:07:28 +0000
2633+++ qml/Wizard/StackButton.qml 2015-10-08 09:07:28 +0000
2634@@ -14,7 +14,7 @@
2635 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2636 */
2637
2638-import QtQuick 2.3
2639+import QtQuick 2.4
2640 import Ubuntu.Components 1.2
2641
2642 AbstractButton {
2643
2644=== modified file 'qml/Wizard/Wizard.qml'
2645--- qml/Wizard/Wizard.qml 2015-10-08 09:07:28 +0000
2646+++ qml/Wizard/Wizard.qml 2015-10-08 09:07:28 +0000
2647@@ -14,7 +14,7 @@
2648 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2649 */
2650
2651-import QtQuick 2.3
2652+import QtQuick 2.4
2653 import Ubuntu.Components 1.2
2654 import Wizard 0.1
2655 import "../Components"
2656
2657=== modified file 'tests/CMakeLists.txt'
2658--- tests/CMakeLists.txt 2015-10-08 09:07:28 +0000
2659+++ tests/CMakeLists.txt 2015-10-08 09:07:28 +0000
2660@@ -132,4 +132,4 @@
2661 add_subdirectory(plugins)
2662 add_subdirectory(qmltests)
2663 add_subdirectory(whitespace)
2664-add_subdirectory(sdk)
2665+add_subdirectory(imports)
2666
2667=== renamed directory 'tests/sdk' => 'tests/imports'
2668=== modified file 'tests/imports/CMakeLists.txt'
2669--- tests/sdk/CMakeLists.txt 2015-10-08 09:07:28 +0000
2670+++ tests/imports/CMakeLists.txt 2015-10-08 09:07:28 +0000
2671@@ -1,6 +1,6 @@
2672
2673 #
2674-# Test that all imports for Ubuntu.Components use the wanted version
2675+# Test that all imports for QtQuick and Ubuntu.Components use the wanted version
2676 #
2677
2678-add_test(SDK ${CMAKE_CURRENT_SOURCE_DIR}/check_sdk.py ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
2679+add_test(imports ${CMAKE_CURRENT_SOURCE_DIR}/check_imports.py ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
2680
2681=== renamed file 'tests/sdk/check_sdk.py' => 'tests/imports/check_imports.py'
2682--- tests/sdk/check_sdk.py 2015-10-08 09:07:28 +0000
2683+++ tests/imports/check_imports.py 2015-10-08 09:07:28 +0000
2684@@ -15,14 +15,12 @@
2685 # You should have received a copy of the GNU General Public License
2686 # along with this program. If not, see <http://www.gnu.org/licenses/>.
2687 #
2688-# Authored by: Michi Henning <michi.henning@canonical.com>
2689-#
2690
2691 #
2692 # Little helper program to test that all source files import
2693-# the wanted SDK version
2694+# versions we want
2695 #
2696-# Usage: check_sdk.py directory [ignore_prefix]
2697+# Usage: check_imports.py directory [ignore_prefix]
2698 #
2699 # The directory specifies the (recursive) location of the source files. Any
2700 # files with a path that starts with ignore_prefix are not checked. This is
2701@@ -48,38 +46,48 @@
2702 def raise_error(e):
2703 raise e
2704
2705-# Scan lines in file_path for bad SDK version. For each file,
2706-# print the line numbers that have SDK version issues
2707+# Qt Quick patterns
2708+# If you increase this make sure you increase
2709+# the Qt version in debian/control and in CMakeLists.txt
2710+quick_pat = re.compile(r'.*import QtQuick.*$')
2711+quick_good_pat = re.compile(r'.*import QtQuick 2\.4.*$')
2712+quick_layouts_good_pat = re.compile(r'.*import QtQuick.Layouts 1\.1.*$')
2713+quick_window_good_pat = re.compile(r'.*import QtQuick.Window 2\.2.*$')
2714
2715+# Ubuntu Components patterns
2716 ubuntu_components_pat = re.compile(r'.*import Ubuntu.Components.*')
2717 ubuntu_good_components_pat = re.compile(r'.*import Ubuntu.Components.*1\.2.*')
2718 # Ubuntu.Components.Themes only has 0.1 and 1.3
2719 # 0.1 is actually 1.2
2720 ubuntu_good_components_themes_pat = re.compile(r'.*import Ubuntu.Components.Themes 0\.1.*')
2721
2722-def scan_for_bad_sdk(file_path):
2723- global ubuntu_components_pat
2724+def scan_for_bad_import(file_path, all_pat, good_pats):
2725 errors = []
2726 with open(file_path, 'rt', encoding='utf-8') as ifile:
2727 for lino, line in enumerate(ifile, start=1):
2728- if ubuntu_components_pat.match(line) and not (ubuntu_good_components_pat.match(line) or ubuntu_good_components_themes_pat.match(line)):
2729- errors.append(lino)
2730+ if all_pat.match(line):
2731+ good_found = False
2732+ for good_pat in good_pats:
2733+ if good_pat.match(line):
2734+ good_found = True
2735+ if not good_found:
2736+ errors.append(lino)
2737 if 0 < len(errors) <= 10:
2738 if len(errors) > 1:
2739 plural = 's'
2740 else:
2741 plural = ''
2742 print(
2743- "%s: bad SDK Version in line%s %s" % (
2744+ "%s: bad import version in line%s %s" % (
2745 file_path, plural, ", ".join((str(i) for i in errors))))
2746 elif errors:
2747- print("%s: bad SDK Version in multiple lines" % file_path)
2748+ print("%s: bad import version in multiple lines" % file_path)
2749 return bool(errors)
2750
2751 # Parse args
2752
2753 parser = argparse.ArgumentParser(
2754- description='Test that source files contain the wanted SDK version.')
2755+ description='Test that source files contain the wanted import version.')
2756 parser.add_argument(
2757 'dir', nargs=1,
2758 help='The directory to (recursively) search for source files')
2759@@ -88,7 +96,7 @@
2760 help='Ignore source files with a path that starts with the given prefix.')
2761 args = parser.parse_args()
2762
2763-# Files we want to check for SDK version.
2764+# Files we want to check for import version.
2765
2766 file_pat = (
2767 r'(.*\.(js|qml)$)')
2768@@ -100,18 +108,21 @@
2769 directory = os.path.abspath(args.dir[0])
2770 ignore = args.ignore_prefix and os.path.abspath(args.ignore_prefix) or None
2771
2772-found_bad_sdk = False
2773+found_bad_import = False
2774 try:
2775 for root, dirs, files in os.walk(directory, onerror=raise_error):
2776 for file in files:
2777 path = os.path.join(root, file)
2778 if not (ignore and path.startswith(ignore)) and pat.match(file):
2779- if scan_for_bad_sdk(path):
2780- found_bad_sdk = True
2781+ quick_good_pats = [quick_good_pat, quick_layouts_good_pat, quick_window_good_pat]
2782+ if scan_for_bad_import(path, quick_pat, quick_good_pats):
2783+ found_bad_import = True
2784+ if scan_for_bad_import(path, ubuntu_components_pat, [ubuntu_good_components_pat, ubuntu_good_components_themes_pat]):
2785+ found_bad_import = True
2786
2787 except OSError as e:
2788 error("cannot create file list for \"" + dir + "\": " + e.strerror)
2789 sys.exit(1)
2790
2791-if found_bad_sdk:
2792+if found_bad_import:
2793 sys.exit(1)
2794
2795=== modified file 'tests/mocks/MeeGo/QOfono/MockOfonoSimManager.qml'
2796--- tests/mocks/MeeGo/QOfono/MockOfonoSimManager.qml 2015-02-19 21:34:08 +0000
2797+++ tests/mocks/MeeGo/QOfono/MockOfonoSimManager.qml 2015-10-08 09:07:28 +0000
2798@@ -14,7 +14,7 @@
2799 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2800 */
2801
2802-import QtQuick 2.3
2803+import QtQuick 2.4
2804 import MeeGo.QOfono 0.2
2805
2806 Item {
2807
2808=== modified file 'tests/mocks/QMenuModel/QDBusActionGroup.qml'
2809--- tests/mocks/QMenuModel/QDBusActionGroup.qml 2015-07-01 11:24:42 +0000
2810+++ tests/mocks/QMenuModel/QDBusActionGroup.qml 2015-10-08 09:07:28 +0000
2811@@ -17,7 +17,7 @@
2812 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2813 */
2814
2815-import QtQuick 2.0
2816+import QtQuick 2.4
2817 import Ubuntu.Settings.Menus 0.1 as Menus
2818 import QMenuModel 0.1
2819
2820@@ -34,7 +34,7 @@
2821
2822 function action(actionName) {
2823 return Qt.createQmlObject("
2824- import QtQuick 2.3
2825+ import QtQuick 2.4
2826 import QMenuModel 0.1
2827
2828 QtObject {
2829
2830=== modified file 'tests/mocks/QMenuModel/UnityMenuAction.qml'
2831--- tests/mocks/QMenuModel/UnityMenuAction.qml 2013-10-14 11:21:11 +0000
2832+++ tests/mocks/QMenuModel/UnityMenuAction.qml 2015-10-08 09:07:28 +0000
2833@@ -17,7 +17,7 @@
2834 * Nick Dedekind <nick.dedekind@canonical.com>
2835 */
2836
2837-import QtQuick 2.0
2838+import QtQuick 2.4
2839 import QMenuModel 0.1
2840
2841 QtObject {
2842
2843=== modified file 'tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/MockLanguagePlugin.qml'
2844--- tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/MockLanguagePlugin.qml 2014-11-24 19:51:51 +0000
2845+++ tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/MockLanguagePlugin.qml 2015-10-08 09:07:28 +0000
2846@@ -14,7 +14,7 @@
2847 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2848 */
2849
2850-import QtQuick 2.3
2851+import QtQuick 2.4
2852
2853 Item {
2854 property var languageNames: ["English", "French", "Spanish"]
2855
2856=== modified file 'tests/mocks/Ubuntu/Web/WebView.qml'
2857--- tests/mocks/Ubuntu/Web/WebView.qml 2015-05-01 14:34:56 +0000
2858+++ tests/mocks/Ubuntu/Web/WebView.qml 2015-10-08 09:07:28 +0000
2859@@ -15,7 +15,7 @@
2860 *
2861 */
2862
2863-import QtQuick 2.0
2864+import QtQuick 2.4
2865
2866 Item {
2867 property url url
2868
2869=== modified file 'tests/mocks/Unity/Application/resources/MirSurfaceItem.qml'
2870--- tests/mocks/Unity/Application/resources/MirSurfaceItem.qml 2015-09-02 08:04:41 +0000
2871+++ tests/mocks/Unity/Application/resources/MirSurfaceItem.qml 2015-10-08 09:07:28 +0000
2872@@ -14,7 +14,7 @@
2873 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2874 */
2875
2876-import QtQuick 2.0
2877+import QtQuick 2.4
2878
2879 Rectangle {
2880 id: root
2881
2882=== modified file 'tests/mocks/Unity/Application/resources/VirtualKeyboard.qml'
2883--- tests/mocks/Unity/Application/resources/VirtualKeyboard.qml 2015-06-22 10:08:38 +0000
2884+++ tests/mocks/Unity/Application/resources/VirtualKeyboard.qml 2015-10-08 09:07:28 +0000
2885@@ -14,7 +14,7 @@
2886 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2887 */
2888
2889-import QtQuick 2.0
2890+import QtQuick 2.4
2891 import Unity.Application 0.1
2892
2893 Item {
2894
2895=== modified file 'tests/mocks/Unity/Indicators/ActionRootState.qml'
2896--- tests/mocks/Unity/Indicators/ActionRootState.qml 2014-11-11 10:45:41 +0000
2897+++ tests/mocks/Unity/Indicators/ActionRootState.qml 2015-10-08 09:07:28 +0000
2898@@ -17,7 +17,7 @@
2899 * Nick Dedekind <nick.dedekind@canonical.com>
2900 */
2901
2902-import QtQuick 2.0
2903+import QtQuick 2.4
2904
2905 QtObject {
2906 property var actionGroup
2907
2908=== modified file 'tests/mocks/Unity/Indicators/IndicatorsModel.qml'
2909--- tests/mocks/Unity/Indicators/IndicatorsModel.qml 2014-10-17 14:55:35 +0000
2910+++ tests/mocks/Unity/Indicators/IndicatorsModel.qml 2015-10-08 09:07:28 +0000
2911@@ -14,7 +14,7 @@
2912 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2913 */
2914
2915-import QtQuick 2.0
2916+import QtQuick 2.4
2917 import Unity.Indicators 0.1 as Indicators
2918
2919 Indicators.FakeIndicatorsModel {
2920
2921=== modified file 'tests/mocks/Unity/Indicators/ModelActionRootState.qml'
2922--- tests/mocks/Unity/Indicators/ModelActionRootState.qml 2014-11-11 15:28:13 +0000
2923+++ tests/mocks/Unity/Indicators/ModelActionRootState.qml 2015-10-08 09:07:28 +0000
2924@@ -17,7 +17,7 @@
2925 * Nick Dedekind <nick.dedekind@canonical.com>
2926 */
2927
2928-import QtQuick 2.0
2929+import QtQuick 2.4
2930
2931 Item {
2932 property var menu: null
2933
2934=== modified file 'tests/mocks/Utils/HomeKeyWatcher.qml'
2935--- tests/mocks/Utils/HomeKeyWatcher.qml 2015-05-06 11:22:18 +0000
2936+++ tests/mocks/Utils/HomeKeyWatcher.qml 2015-10-08 09:07:28 +0000
2937@@ -14,7 +14,7 @@
2938 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2939 */
2940
2941-import QtQuick 2.0
2942+import QtQuick 2.4
2943
2944 QtObject {
2945 signal activated()
2946
2947=== modified file 'tests/plugins/Dash/cardcreatortest.qml'
2948--- tests/plugins/Dash/cardcreatortest.qml 2014-05-06 10:06:54 +0000
2949+++ tests/plugins/Dash/cardcreatortest.qml 2015-10-08 09:07:28 +0000
2950@@ -14,7 +14,7 @@
2951 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2952 */
2953
2954-import QtQuick 2.2
2955+import QtQuick 2.4
2956 import "../../../plugins/Dash/CardCreator.js" as CardCreator
2957
2958 Item {
2959
2960=== modified file 'tests/plugins/Dash/horizontaljournaltest.qml'
2961--- tests/plugins/Dash/horizontaljournaltest.qml 2014-11-17 11:38:07 +0000
2962+++ tests/plugins/Dash/horizontaljournaltest.qml 2015-10-08 09:07:28 +0000
2963@@ -14,7 +14,7 @@
2964 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2965 */
2966
2967-import QtQuick 2.1
2968+import QtQuick 2.4
2969 import Dash 0.1
2970
2971 Item {
2972
2973=== modified file 'tests/plugins/Dash/horizontaljournaltry.qml'
2974--- tests/plugins/Dash/horizontaljournaltry.qml 2014-06-05 10:29:32 +0000
2975+++ tests/plugins/Dash/horizontaljournaltry.qml 2015-10-08 09:07:28 +0000
2976@@ -14,7 +14,7 @@
2977 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2978 */
2979
2980-import QtQuick 2.1
2981+import QtQuick 2.4
2982 import Dash 0.1
2983
2984 Item {
2985
2986=== modified file 'tests/plugins/Dash/listviewwithpageheadertest.qml'
2987--- tests/plugins/Dash/listviewwithpageheadertest.qml 2014-08-26 08:41:02 +0000
2988+++ tests/plugins/Dash/listviewwithpageheadertest.qml 2015-10-08 09:07:28 +0000
2989@@ -14,7 +14,7 @@
2990 * along with this program. If not, see <http://www.gnu.org/licenses/>.
2991 */
2992
2993-import QtQuick 2.0
2994+import QtQuick 2.4
2995 import Dash 0.1
2996
2997 Rectangle {
2998
2999=== modified file 'tests/plugins/Dash/listviewwithpageheadertestsection.qml'
3000--- tests/plugins/Dash/listviewwithpageheadertestsection.qml 2014-08-26 08:41:02 +0000
3001+++ tests/plugins/Dash/listviewwithpageheadertestsection.qml 2015-10-08 09:07:28 +0000
3002@@ -14,7 +14,7 @@
3003 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3004 */
3005
3006-import QtQuick 2.0
3007+import QtQuick 2.4
3008 import Dash 0.1
3009
3010 Rectangle {
3011
3012=== modified file 'tests/plugins/Dash/listviewwithpageheadertestsectionexternalmodel.qml'
3013--- tests/plugins/Dash/listviewwithpageheadertestsectionexternalmodel.qml 2014-08-26 08:41:02 +0000
3014+++ tests/plugins/Dash/listviewwithpageheadertestsectionexternalmodel.qml 2015-10-08 09:07:28 +0000
3015@@ -14,7 +14,7 @@
3016 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3017 */
3018
3019-import QtQuick 2.0
3020+import QtQuick 2.4
3021 import Dash 0.1
3022
3023 Rectangle {
3024
3025=== modified file 'tests/plugins/Dash/organicgridtest.qml'
3026--- tests/plugins/Dash/organicgridtest.qml 2014-11-17 11:42:04 +0000
3027+++ tests/plugins/Dash/organicgridtest.qml 2015-10-08 09:07:28 +0000
3028@@ -14,7 +14,7 @@
3029 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3030 */
3031
3032-import QtQuick 2.1
3033+import QtQuick 2.4
3034 import Dash 0.1
3035
3036 Item {
3037
3038=== modified file 'tests/plugins/Dash/organicgridtry.qml'
3039--- tests/plugins/Dash/organicgridtry.qml 2014-06-05 10:29:32 +0000
3040+++ tests/plugins/Dash/organicgridtry.qml 2015-10-08 09:07:28 +0000
3041@@ -14,7 +14,7 @@
3042 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3043 */
3044
3045-import QtQuick 2.1
3046+import QtQuick 2.4
3047 import Dash 0.1
3048
3049 Item {
3050
3051=== modified file 'tests/plugins/Dash/tst_CardAttributes.qml'
3052--- tests/plugins/Dash/tst_CardAttributes.qml 2014-08-16 10:23:30 +0000
3053+++ tests/plugins/Dash/tst_CardAttributes.qml 2015-10-08 09:07:28 +0000
3054@@ -14,7 +14,7 @@
3055 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3056 */
3057
3058-import QtQuick 2.0
3059+import QtQuick 2.4
3060 import QtTest 1.0
3061 import Dash 0.1
3062
3063
3064=== modified file 'tests/plugins/Dash/tst_CroppedImageMinimumSourceSize.qml'
3065--- tests/plugins/Dash/tst_CroppedImageMinimumSourceSize.qml 2015-10-08 09:07:28 +0000
3066+++ tests/plugins/Dash/tst_CroppedImageMinimumSourceSize.qml 2015-10-08 09:07:28 +0000
3067@@ -14,7 +14,7 @@
3068 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3069 */
3070
3071-import QtQuick 2.3
3072+import QtQuick 2.4
3073 import QtTest 1.0
3074 import Ubuntu.Components 1.2
3075 import Dash 0.1
3076
3077=== modified file 'tests/plugins/Dash/tst_ListViewWithPageHeaderQML.qml'
3078--- tests/plugins/Dash/tst_ListViewWithPageHeaderQML.qml 2014-07-23 08:45:47 +0000
3079+++ tests/plugins/Dash/tst_ListViewWithPageHeaderQML.qml 2015-10-08 09:07:28 +0000
3080@@ -14,7 +14,7 @@
3081 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3082 */
3083
3084-import QtQuick 2.0
3085+import QtQuick 2.4
3086 import QtTest 1.0
3087 import Dash 0.1
3088
3089
3090=== modified file 'tests/plugins/Dash/tst_ScopeStyle.qml'
3091--- tests/plugins/Dash/tst_ScopeStyle.qml 2015-10-08 09:07:28 +0000
3092+++ tests/plugins/Dash/tst_ScopeStyle.qml 2015-10-08 09:07:28 +0000
3093@@ -14,7 +14,7 @@
3094 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3095 */
3096
3097-import QtQuick 2.2
3098+import QtQuick 2.4
3099 import QtTest 1.0
3100 import Dash 0.1
3101 import Ubuntu.Components 1.2
3102
3103=== modified file 'tests/plugins/Dash/verticaljournaltest.qml'
3104--- tests/plugins/Dash/verticaljournaltest.qml 2014-11-17 12:14:05 +0000
3105+++ tests/plugins/Dash/verticaljournaltest.qml 2015-10-08 09:07:28 +0000
3106@@ -14,7 +14,7 @@
3107 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3108 */
3109
3110-import QtQuick 2.1
3111+import QtQuick 2.4
3112 import Dash 0.1
3113
3114 Item {
3115
3116=== modified file 'tests/plugins/Dash/verticaljournaltry.qml'
3117--- tests/plugins/Dash/verticaljournaltry.qml 2014-06-05 10:29:32 +0000
3118+++ tests/plugins/Dash/verticaljournaltry.qml 2015-10-08 09:07:28 +0000
3119@@ -14,7 +14,7 @@
3120 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3121 */
3122
3123-import QtQuick 2.1
3124+import QtQuick 2.4
3125 import Dash 0.1
3126
3127 Item {
3128
3129=== modified file 'tests/plugins/IntegratedLightDM/greeter.qml'
3130--- tests/plugins/IntegratedLightDM/greeter.qml 2015-07-16 20:56:01 +0000
3131+++ tests/plugins/IntegratedLightDM/greeter.qml 2015-10-08 09:07:28 +0000
3132@@ -14,7 +14,7 @@
3133 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3134 */
3135
3136-import QtQuick 2.0
3137+import QtQuick 2.4
3138 import IntegratedLightDM 0.1 as LightDM
3139
3140 Item {
3141
3142=== modified file 'tests/plugins/Ubuntu/Gestures/DownwardsLauncher.qml'
3143--- tests/plugins/Ubuntu/Gestures/DownwardsLauncher.qml 2015-10-08 09:07:28 +0000
3144+++ tests/plugins/Ubuntu/Gestures/DownwardsLauncher.qml 2015-10-08 09:07:28 +0000
3145@@ -14,7 +14,7 @@
3146 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3147 */
3148
3149-import QtQuick 2.0
3150+import QtQuick 2.4
3151 import Ubuntu.Gestures 0.1
3152 import Ubuntu.Components 1.2
3153
3154
3155=== modified file 'tests/plugins/Ubuntu/Gestures/LeftwardsLauncher.qml'
3156--- tests/plugins/Ubuntu/Gestures/LeftwardsLauncher.qml 2015-10-08 09:07:28 +0000
3157+++ tests/plugins/Ubuntu/Gestures/LeftwardsLauncher.qml 2015-10-08 09:07:28 +0000
3158@@ -14,7 +14,7 @@
3159 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3160 */
3161
3162-import QtQuick 2.0
3163+import QtQuick 2.4
3164 import Ubuntu.Gestures 0.1
3165 import Ubuntu.Components 1.2
3166
3167
3168=== modified file 'tests/plugins/Ubuntu/Gestures/RightwardsLauncher.qml'
3169--- tests/plugins/Ubuntu/Gestures/RightwardsLauncher.qml 2015-10-08 09:07:28 +0000
3170+++ tests/plugins/Ubuntu/Gestures/RightwardsLauncher.qml 2015-10-08 09:07:28 +0000
3171@@ -14,7 +14,7 @@
3172 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3173 */
3174
3175-import QtQuick 2.0
3176+import QtQuick 2.4
3177 import Ubuntu.Gestures 0.1
3178 import Ubuntu.Components 1.2
3179
3180
3181=== modified file 'tests/plugins/Ubuntu/Gestures/UpwardsLauncher.qml'
3182--- tests/plugins/Ubuntu/Gestures/UpwardsLauncher.qml 2015-10-08 09:07:28 +0000
3183+++ tests/plugins/Ubuntu/Gestures/UpwardsLauncher.qml 2015-10-08 09:07:28 +0000
3184@@ -14,7 +14,7 @@
3185 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3186 */
3187
3188-import QtQuick 2.0
3189+import QtQuick 2.4
3190 import Ubuntu.Gestures 0.1
3191 import Ubuntu.Components 1.2
3192
3193
3194=== modified file 'tests/plugins/Ubuntu/Gestures/empty.qml'
3195--- tests/plugins/Ubuntu/Gestures/empty.qml 2014-10-20 20:50:02 +0000
3196+++ tests/plugins/Ubuntu/Gestures/empty.qml 2015-10-08 09:07:28 +0000
3197@@ -14,7 +14,7 @@
3198 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3199 */
3200
3201-import QtQuick 2.0
3202+import QtQuick 2.4
3203 import Ubuntu.Gestures 0.1
3204
3205 Item {
3206
3207=== modified file 'tests/plugins/Ubuntu/Gestures/touchGateExample.qml'
3208--- tests/plugins/Ubuntu/Gestures/touchGateExample.qml 2014-10-01 13:20:32 +0000
3209+++ tests/plugins/Ubuntu/Gestures/touchGateExample.qml 2015-10-08 09:07:28 +0000
3210@@ -14,7 +14,7 @@
3211 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3212 */
3213
3214-import QtQuick 2.0
3215+import QtQuick 2.4
3216 import Ubuntu.Gestures 0.1
3217
3218 Rectangle {
3219
3220=== modified file 'tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.qml'
3221--- tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.qml 2015-10-08 09:07:28 +0000
3222+++ tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.qml 2015-10-08 09:07:28 +0000
3223@@ -14,7 +14,7 @@
3224 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3225 */
3226
3227-import QtQuick 2.0
3228+import QtQuick 2.4
3229 import Ubuntu.Components 1.2
3230 import Unity.Test 0.1
3231
3232
3233=== modified file 'tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.qml'
3234--- tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.qml 2015-10-08 09:07:28 +0000
3235+++ tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.qml 2015-10-08 09:07:28 +0000
3236@@ -14,7 +14,7 @@
3237 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3238 */
3239
3240-import QtQuick 2.0
3241+import QtQuick 2.4
3242 import Ubuntu.Components 1.2
3243 import Ubuntu.Gestures 0.1
3244 import Unity.Test 0.1
3245
3246=== modified file 'tests/plugins/Ubuntu/Gestures/tst_PressedOutsideNotifier.qml'
3247--- tests/plugins/Ubuntu/Gestures/tst_PressedOutsideNotifier.qml 2015-10-08 09:07:28 +0000
3248+++ tests/plugins/Ubuntu/Gestures/tst_PressedOutsideNotifier.qml 2015-10-08 09:07:28 +0000
3249@@ -14,7 +14,7 @@
3250 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3251 */
3252
3253-import QtQuick 2.0
3254+import QtQuick 2.4
3255 import Ubuntu.Components 1.2
3256 import Ubuntu.Gestures 0.1
3257
3258
3259=== modified file 'tests/plugins/Ubuntu/Gestures/tst_TouchGate.cpp'
3260--- tests/plugins/Ubuntu/Gestures/tst_TouchGate.cpp 2015-05-21 15:52:48 +0000
3261+++ tests/plugins/Ubuntu/Gestures/tst_TouchGate.cpp 2015-10-08 09:07:28 +0000
3262@@ -19,9 +19,7 @@
3263 #include <QQmlEngine>
3264 #include <QQuickView>
3265 #include <QSharedPointer>
3266-#if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0))
3267- #include <private/qquickwindow_p.h>
3268-#endif
3269+#include <private/qquickwindow_p.h>
3270
3271 // C++ std lib
3272 #include <functional>
3273@@ -188,10 +186,8 @@
3274
3275 if (!ownershipAfterTouchEnd) {
3276 touchRegistry->removeCandidateOwnerForTouch(0, candidateItem);
3277-#if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0))
3278 QQuickWindowPrivate *wp = QQuickWindowPrivate::get(testItem->window());
3279 wp->flushDelayedTouchEvent();
3280-#endif
3281 // TouchGate should now open its flood gates and let testItem get all
3282 // events from touch 0 produced so far
3283 QCOMPARE(testItem->touchEventsReceived.count(), 2);
3284
3285=== modified file 'tests/plugins/Utils/tst_UtilsStyle.qml'
3286--- tests/plugins/Utils/tst_UtilsStyle.qml 2014-08-14 11:43:32 +0000
3287+++ tests/plugins/Utils/tst_UtilsStyle.qml 2015-10-08 09:07:28 +0000
3288@@ -14,7 +14,7 @@
3289 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3290 */
3291
3292-import QtQuick 2.2
3293+import QtQuick 2.4
3294 import QtTest 1.0
3295 import Utils 0.1
3296
3297
3298=== modified file 'tests/qmltests/Components/tst_Background.qml'
3299--- tests/qmltests/Components/tst_Background.qml 2014-08-14 11:43:47 +0000
3300+++ tests/qmltests/Components/tst_Background.qml 2015-10-08 09:07:28 +0000
3301@@ -14,7 +14,7 @@
3302 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3303 */
3304
3305-import QtQuick 2.2
3306+import QtQuick 2.4
3307 import QtTest 1.0
3308 import Unity.Test 0.1
3309
3310
3311=== modified file 'tests/qmltests/Components/tst_Carousel.qml'
3312--- tests/qmltests/Components/tst_Carousel.qml 2015-01-09 09:15:45 +0000
3313+++ tests/qmltests/Components/tst_Carousel.qml 2015-10-08 09:07:28 +0000
3314@@ -14,7 +14,7 @@
3315 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3316 */
3317
3318-import QtQuick 2.0
3319+import QtQuick 2.4
3320 import QtTest 1.0
3321 import "../../../qml/Components/"
3322 import "../../../qml/Components/carousel.js" as Carousel
3323
3324=== modified file 'tests/qmltests/Components/tst_Dialogs.qml'
3325--- tests/qmltests/Components/tst_Dialogs.qml 2015-10-08 09:07:28 +0000
3326+++ tests/qmltests/Components/tst_Dialogs.qml 2015-10-08 09:07:28 +0000
3327@@ -14,7 +14,7 @@
3328 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3329 */
3330
3331-import QtQuick 2.2
3332+import QtQuick 2.4
3333 import QtTest 1.0
3334 import Ubuntu.Components 1.2
3335 import Unity.Test 0.1
3336
3337=== modified file 'tests/qmltests/Components/tst_DragHandle.qml'
3338--- tests/qmltests/Components/tst_DragHandle.qml 2015-10-08 09:07:28 +0000
3339+++ tests/qmltests/Components/tst_DragHandle.qml 2015-10-08 09:07:28 +0000
3340@@ -14,7 +14,7 @@
3341 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3342 */
3343
3344-import QtQuick 2.0
3345+import QtQuick 2.4
3346 import "../../../qml/Components"
3347 import "tst_DragHandle"
3348 import Ubuntu.Components 1.2
3349
3350=== modified file 'tests/qmltests/Components/tst_DragHandle/BidirectionalShowable.qml'
3351--- tests/qmltests/Components/tst_DragHandle/BidirectionalShowable.qml 2015-10-08 09:07:28 +0000
3352+++ tests/qmltests/Components/tst_DragHandle/BidirectionalShowable.qml 2015-10-08 09:07:28 +0000
3353@@ -14,7 +14,7 @@
3354 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3355 */
3356
3357-import QtQuick 2.0
3358+import QtQuick 2.4
3359 import "../../../../qml/Components"
3360 import Ubuntu.Components 1.2
3361 import Ubuntu.Gestures 0.1
3362
3363=== modified file 'tests/qmltests/Components/tst_DragHandle/HorizontalShowable.qml'
3364--- tests/qmltests/Components/tst_DragHandle/HorizontalShowable.qml 2015-10-08 09:07:28 +0000
3365+++ tests/qmltests/Components/tst_DragHandle/HorizontalShowable.qml 2015-10-08 09:07:28 +0000
3366@@ -14,7 +14,7 @@
3367 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3368 */
3369
3370-import QtQuick 2.0
3371+import QtQuick 2.4
3372 import "../../../../qml/Components"
3373 import Ubuntu.Components 1.2
3374 import Ubuntu.Gestures 0.1
3375
3376=== modified file 'tests/qmltests/Components/tst_DragHandle/VerticalShowable.qml'
3377--- tests/qmltests/Components/tst_DragHandle/VerticalShowable.qml 2015-10-08 09:07:28 +0000
3378+++ tests/qmltests/Components/tst_DragHandle/VerticalShowable.qml 2015-10-08 09:07:28 +0000
3379@@ -14,7 +14,7 @@
3380 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3381 */
3382
3383-import QtQuick 2.0
3384+import QtQuick 2.4
3385 import "../../../../qml/Components"
3386 import Ubuntu.Components 1.2
3387 import Ubuntu.Gestures 0.1
3388
3389=== modified file 'tests/qmltests/Components/tst_DraggingArea.qml'
3390--- tests/qmltests/Components/tst_DraggingArea.qml 2013-12-17 16:04:47 +0000
3391+++ tests/qmltests/Components/tst_DraggingArea.qml 2015-10-08 09:07:28 +0000
3392@@ -14,7 +14,7 @@
3393 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3394 */
3395
3396-import QtQuick 2.0
3397+import QtQuick 2.4
3398 import QtTest 1.0
3399 import "../../../qml/Components"
3400
3401
3402=== modified file 'tests/qmltests/Components/tst_EdgeDragEvaluator.qml'
3403--- tests/qmltests/Components/tst_EdgeDragEvaluator.qml 2015-04-27 15:30:18 +0000
3404+++ tests/qmltests/Components/tst_EdgeDragEvaluator.qml 2015-10-08 09:07:28 +0000
3405@@ -14,7 +14,7 @@
3406 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3407 */
3408
3409-import QtQuick 2.0
3410+import QtQuick 2.4
3411 import "../../../qml/Components"
3412
3413 Item {
3414
3415=== modified file 'tests/qmltests/Components/tst_LazyImage.qml'
3416--- tests/qmltests/Components/tst_LazyImage.qml 2015-10-08 09:07:28 +0000
3417+++ tests/qmltests/Components/tst_LazyImage.qml 2015-10-08 09:07:28 +0000
3418@@ -14,7 +14,7 @@
3419 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3420 */
3421
3422-import QtQuick 2.0
3423+import QtQuick 2.4
3424 import QtTest 1.0
3425 import "../../../qml/Components"
3426 import Ubuntu.Components 1.2
3427
3428=== modified file 'tests/qmltests/Components/tst_LazyImage/ImageControls.qml'
3429--- tests/qmltests/Components/tst_LazyImage/ImageControls.qml 2015-10-08 09:07:28 +0000
3430+++ tests/qmltests/Components/tst_LazyImage/ImageControls.qml 2015-10-08 09:07:28 +0000
3431@@ -14,7 +14,7 @@
3432 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3433 */
3434
3435-import QtQuick 2.0
3436+import QtQuick 2.4
3437 import Ubuntu.Components 1.2
3438 import "../../../../qml/Components"
3439
3440
3441=== modified file 'tests/qmltests/Components/tst_Lockscreen.qml'
3442--- tests/qmltests/Components/tst_Lockscreen.qml 2015-10-08 09:07:28 +0000
3443+++ tests/qmltests/Components/tst_Lockscreen.qml 2015-10-08 09:07:28 +0000
3444@@ -14,7 +14,7 @@
3445 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3446 */
3447
3448-import QtQuick 2.0
3449+import QtQuick 2.4
3450 import QtTest 1.0
3451 import ".."
3452 import "../../../qml/Components"
3453
3454=== modified file 'tests/qmltests/Components/tst_PhysicalKeysMapper.qml'
3455--- tests/qmltests/Components/tst_PhysicalKeysMapper.qml 2015-09-15 12:05:17 +0000
3456+++ tests/qmltests/Components/tst_PhysicalKeysMapper.qml 2015-10-08 09:07:28 +0000
3457@@ -14,7 +14,7 @@
3458 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3459 */
3460
3461-import QtQuick 2.0
3462+import QtQuick 2.4
3463 import QtTest 1.0
3464 import "../../../qml/Components"
3465 import Powerd 0.1
3466
3467=== modified file 'tests/qmltests/Components/tst_Rating.qml'
3468--- tests/qmltests/Components/tst_Rating.qml 2015-10-08 09:07:28 +0000
3469+++ tests/qmltests/Components/tst_Rating.qml 2015-10-08 09:07:28 +0000
3470@@ -14,7 +14,7 @@
3471 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3472 */
3473
3474-import QtQuick 2.0
3475+import QtQuick 2.4
3476 import QtTest 1.0
3477 import "../../../qml/Components"
3478 import Ubuntu.Components 1.2
3479
3480=== modified file 'tests/qmltests/Components/tst_ResponsiveGridView.qml'
3481--- tests/qmltests/Components/tst_ResponsiveGridView.qml 2015-10-08 09:07:28 +0000
3482+++ tests/qmltests/Components/tst_ResponsiveGridView.qml 2015-10-08 09:07:28 +0000
3483@@ -14,7 +14,7 @@
3484 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3485 */
3486
3487-import QtQuick 2.0
3488+import QtQuick 2.4
3489 import QtTest 1.0
3490 import ".."
3491 import "../../../qml/Components"
3492
3493=== modified file 'tests/qmltests/Components/tst_ResponsiveVerticalJournal.qml'
3494--- tests/qmltests/Components/tst_ResponsiveVerticalJournal.qml 2015-10-08 09:07:28 +0000
3495+++ tests/qmltests/Components/tst_ResponsiveVerticalJournal.qml 2015-10-08 09:07:28 +0000
3496@@ -14,7 +14,7 @@
3497 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3498 */
3499
3500-import QtQuick 2.0
3501+import QtQuick 2.4
3502 import QtTest 1.0
3503 import ".."
3504 import "../../../qml/Components"
3505
3506=== modified file 'tests/qmltests/Components/tst_Showable.qml'
3507--- tests/qmltests/Components/tst_Showable.qml 2015-10-08 09:07:28 +0000
3508+++ tests/qmltests/Components/tst_Showable.qml 2015-10-08 09:07:28 +0000
3509@@ -14,7 +14,7 @@
3510 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3511 */
3512
3513-import QtQuick 2.0
3514+import QtQuick 2.4
3515 import QtTest 1.0
3516 import Ubuntu.Components 1.2
3517 import Unity.Test 0.1 as UT
3518
3519=== modified file 'tests/qmltests/Components/tst_ZoomableImage.qml'
3520--- tests/qmltests/Components/tst_ZoomableImage.qml 2015-03-18 14:34:18 +0000
3521+++ tests/qmltests/Components/tst_ZoomableImage.qml 2015-10-08 09:07:28 +0000
3522@@ -14,7 +14,7 @@
3523 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3524 */
3525
3526-import QtQuick 2.0
3527+import QtQuick 2.4
3528 import QtTest 1.0
3529 import "../../../qml/Components"
3530 import Unity.Test 0.1 as UT
3531
3532=== modified file 'tests/qmltests/Dash/Previews/MockPreviewWidget.qml'
3533--- tests/qmltests/Dash/Previews/MockPreviewWidget.qml 2014-02-07 09:54:32 +0000
3534+++ tests/qmltests/Dash/Previews/MockPreviewWidget.qml 2015-10-08 09:07:28 +0000
3535@@ -15,7 +15,7 @@
3536 *
3537 */
3538
3539-import QtQuick 2.0
3540+import QtQuick 2.4
3541 import "../../../../qml/Dash/Previews"
3542
3543 PreviewWidget {
3544
3545=== modified file 'tests/qmltests/Dash/Previews/tst_Preview.qml'
3546--- tests/qmltests/Dash/Previews/tst_Preview.qml 2015-03-12 16:08:14 +0000
3547+++ tests/qmltests/Dash/Previews/tst_Preview.qml 2015-10-08 09:07:28 +0000
3548@@ -14,7 +14,7 @@
3549 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3550 */
3551
3552-import QtQuick 2.0
3553+import QtQuick 2.4
3554 import QtTest 1.0
3555 import "../../../../qml/Dash/Previews"
3556 import Unity.Test 0.1 as UT
3557
3558=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewActions.qml'
3559--- tests/qmltests/Dash/Previews/tst_PreviewActions.qml 2015-10-08 09:07:28 +0000
3560+++ tests/qmltests/Dash/Previews/tst_PreviewActions.qml 2015-10-08 09:07:28 +0000
3561@@ -14,7 +14,7 @@
3562 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3563 */
3564
3565-import QtQuick 2.0
3566+import QtQuick 2.4
3567 import QtTest 1.0
3568 import "../../../../qml/Dash/Previews"
3569 import Unity.Test 0.1 as UT
3570
3571=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewAudioPlayback.qml'
3572--- tests/qmltests/Dash/Previews/tst_PreviewAudioPlayback.qml 2015-10-08 09:07:28 +0000
3573+++ tests/qmltests/Dash/Previews/tst_PreviewAudioPlayback.qml 2015-10-08 09:07:28 +0000
3574@@ -14,7 +14,7 @@
3575 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3576 */
3577
3578-import QtQuick 2.0
3579+import QtQuick 2.4
3580 import QtTest 1.0
3581 import Ubuntu.Components 1.2
3582 import "../../../../qml/Dash/Previews"
3583
3584=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewComment.qml'
3585--- tests/qmltests/Dash/Previews/tst_PreviewComment.qml 2015-10-08 09:07:28 +0000
3586+++ tests/qmltests/Dash/Previews/tst_PreviewComment.qml 2015-10-08 09:07:28 +0000
3587@@ -14,7 +14,7 @@
3588 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3589 */
3590
3591-import QtQuick 2.0
3592+import QtQuick 2.4
3593 import QtTest 1.0
3594 import Ubuntu.Components 1.2
3595 import "../../../../qml/Dash/Previews"
3596
3597=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewCommentInput.qml'
3598--- tests/qmltests/Dash/Previews/tst_PreviewCommentInput.qml 2015-10-08 09:07:28 +0000
3599+++ tests/qmltests/Dash/Previews/tst_PreviewCommentInput.qml 2015-10-08 09:07:28 +0000
3600@@ -14,7 +14,7 @@
3601 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3602 */
3603
3604-import QtQuick 2.0
3605+import QtQuick 2.4
3606 import QtTest 1.0
3607 import Ubuntu.Components 1.2
3608 import "../../../../qml/Dash/Previews"
3609
3610=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml'
3611--- tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml 2015-10-08 09:07:28 +0000
3612+++ tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml 2015-10-08 09:07:28 +0000
3613@@ -14,7 +14,7 @@
3614 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3615 */
3616
3617-import QtQuick 2.0
3618+import QtQuick 2.4
3619 import QtTest 1.0
3620 import Ubuntu.Components 1.2
3621 import "../../../../qml/Dash/Previews"
3622
3623=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewHeader.qml'
3624--- tests/qmltests/Dash/Previews/tst_PreviewHeader.qml 2015-05-06 15:05:06 +0000
3625+++ tests/qmltests/Dash/Previews/tst_PreviewHeader.qml 2015-10-08 09:07:28 +0000
3626@@ -14,7 +14,7 @@
3627 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3628 */
3629
3630-import QtQuick 2.0
3631+import QtQuick 2.4
3632 import QtTest 1.0
3633 import "../../../../qml/Dash/Previews"
3634 import Unity.Test 0.1 as UT
3635
3636=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewIconActions.qml'
3637--- tests/qmltests/Dash/Previews/tst_PreviewIconActions.qml 2015-10-08 09:07:28 +0000
3638+++ tests/qmltests/Dash/Previews/tst_PreviewIconActions.qml 2015-10-08 09:07:28 +0000
3639@@ -14,7 +14,7 @@
3640 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3641 */
3642
3643-import QtQuick 2.0
3644+import QtQuick 2.4
3645 import QtTest 1.0
3646 import "../../../../qml/Dash/Previews"
3647 import Unity.Test 0.1 as UT
3648
3649=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewImageGallery.qml'
3650--- tests/qmltests/Dash/Previews/tst_PreviewImageGallery.qml 2015-05-06 15:05:06 +0000
3651+++ tests/qmltests/Dash/Previews/tst_PreviewImageGallery.qml 2015-10-08 09:07:28 +0000
3652@@ -14,7 +14,7 @@
3653 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3654 */
3655
3656-import QtQuick 2.0
3657+import QtQuick 2.4
3658 import QtTest 1.0
3659 import "../../../../qml/Dash/Previews"
3660 import Unity.Test 0.1 as UT
3661
3662=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewPayments.qml'
3663--- tests/qmltests/Dash/Previews/tst_PreviewPayments.qml 2015-10-08 09:07:28 +0000
3664+++ tests/qmltests/Dash/Previews/tst_PreviewPayments.qml 2015-10-08 09:07:28 +0000
3665@@ -14,7 +14,7 @@
3666 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3667 */
3668
3669-import QtQuick 2.0
3670+import QtQuick 2.4
3671 import QtTest 1.0
3672 import "../../../../qml/Dash/Previews"
3673 import Unity.Test 0.1 as UT
3674
3675=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewProgress.qml'
3676--- tests/qmltests/Dash/Previews/tst_PreviewProgress.qml 2015-10-08 09:07:28 +0000
3677+++ tests/qmltests/Dash/Previews/tst_PreviewProgress.qml 2015-10-08 09:07:28 +0000
3678@@ -14,7 +14,7 @@
3679 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3680 */
3681
3682-import QtQuick 2.0
3683+import QtQuick 2.4
3684 import QtTest 1.0
3685 import "../../../../qml/Dash/Previews"
3686 import Unity.Test 0.1 as UT
3687
3688=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewRatingDisplay.qml'
3689--- tests/qmltests/Dash/Previews/tst_PreviewRatingDisplay.qml 2015-10-08 09:07:28 +0000
3690+++ tests/qmltests/Dash/Previews/tst_PreviewRatingDisplay.qml 2015-10-08 09:07:28 +0000
3691@@ -14,7 +14,7 @@
3692 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3693 */
3694
3695-import QtQuick 2.0
3696+import QtQuick 2.4
3697 import QtTest 1.0
3698 import Ubuntu.Components 1.2
3699 import "../../../../qml/Dash/Previews"
3700
3701=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewRatingEdit.qml'
3702--- tests/qmltests/Dash/Previews/tst_PreviewRatingEdit.qml 2015-10-08 09:07:28 +0000
3703+++ tests/qmltests/Dash/Previews/tst_PreviewRatingEdit.qml 2015-10-08 09:07:28 +0000
3704@@ -14,7 +14,7 @@
3705 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3706 */
3707
3708-import QtQuick 2.0
3709+import QtQuick 2.4
3710 import QtTest 1.0
3711 import Ubuntu.Components 1.2
3712 import "../../../../qml/Dash/Previews"
3713
3714=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewRatingInput.qml'
3715--- tests/qmltests/Dash/Previews/tst_PreviewRatingInput.qml 2015-10-08 09:07:28 +0000
3716+++ tests/qmltests/Dash/Previews/tst_PreviewRatingInput.qml 2015-10-08 09:07:28 +0000
3717@@ -14,7 +14,7 @@
3718 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3719 */
3720
3721-import QtQuick 2.0
3722+import QtQuick 2.4
3723 import QtTest 1.0
3724 import Ubuntu.Components 1.2
3725 import "../../../../qml/Dash/Previews"
3726
3727=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewTable.qml'
3728--- tests/qmltests/Dash/Previews/tst_PreviewTable.qml 2015-10-08 09:07:28 +0000
3729+++ tests/qmltests/Dash/Previews/tst_PreviewTable.qml 2015-10-08 09:07:28 +0000
3730@@ -14,7 +14,7 @@
3731 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3732 */
3733
3734-import QtQuick 2.0
3735+import QtQuick 2.4
3736 import QtTest 1.0
3737 import Ubuntu.Components 1.2
3738 import "../../../../qml/Dash/Previews"
3739
3740=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewTextSummary.qml'
3741--- tests/qmltests/Dash/Previews/tst_PreviewTextSummary.qml 2015-10-08 09:07:28 +0000
3742+++ tests/qmltests/Dash/Previews/tst_PreviewTextSummary.qml 2015-10-08 09:07:28 +0000
3743@@ -14,7 +14,7 @@
3744 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3745 */
3746
3747-import QtQuick 2.0
3748+import QtQuick 2.4
3749 import QtTest 1.0
3750 import Ubuntu.Components 1.2
3751 import "../../../../qml/Dash/Previews"
3752
3753=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewVideoPlayback.qml'
3754--- tests/qmltests/Dash/Previews/tst_PreviewVideoPlayback.qml 2014-03-03 10:02:43 +0000
3755+++ tests/qmltests/Dash/Previews/tst_PreviewVideoPlayback.qml 2015-10-08 09:07:28 +0000
3756@@ -14,7 +14,7 @@
3757 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3758 */
3759
3760-import QtQuick 2.0
3761+import QtQuick 2.4
3762 import QtTest 1.0
3763 import "../../../../qml/Dash/Previews"
3764 import Unity.Test 0.1 as UT
3765
3766=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml'
3767--- tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml 2015-07-21 07:22:23 +0000
3768+++ tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml 2015-10-08 09:07:28 +0000
3769@@ -14,7 +14,7 @@
3770 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3771 */
3772
3773-import QtQuick 2.0
3774+import QtQuick 2.4
3775 import QtTest 1.0
3776 import "../../../../qml/Dash/Previews"
3777 import Unity.Test 0.1 as UT
3778
3779=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qml'
3780--- tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qml 2015-05-06 15:05:06 +0000
3781+++ tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qml 2015-10-08 09:07:28 +0000
3782@@ -14,7 +14,7 @@
3783 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3784 */
3785
3786-import QtQuick 2.0
3787+import QtQuick 2.4
3788 import QtTest 1.0
3789 import "../../../../qml/Dash/Previews"
3790 import Unity.Test 0.1 as UT
3791
3792=== modified file 'tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingBoolean.qml'
3793--- tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingBoolean.qml 2015-10-08 09:07:28 +0000
3794+++ tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingBoolean.qml 2015-10-08 09:07:28 +0000
3795@@ -14,7 +14,7 @@
3796 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3797 */
3798
3799-import QtQuick 2.0
3800+import QtQuick 2.4
3801 import Ubuntu.Components 1.2
3802 import QtTest 1.0
3803 import "../../../../qml/Dash/ScopeSettings"
3804
3805=== modified file 'tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingList.qml'
3806--- tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingList.qml 2015-10-08 09:07:28 +0000
3807+++ tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingList.qml 2015-10-08 09:07:28 +0000
3808@@ -14,7 +14,7 @@
3809 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3810 */
3811
3812-import QtQuick 2.0
3813+import QtQuick 2.4
3814 import Ubuntu.Components 1.2
3815 import QtTest 1.0
3816 import "../../../../qml/Dash/ScopeSettings"
3817
3818=== modified file 'tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingNumber.qml'
3819--- tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingNumber.qml 2015-10-08 09:07:28 +0000
3820+++ tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingNumber.qml 2015-10-08 09:07:28 +0000
3821@@ -14,7 +14,7 @@
3822 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3823 */
3824
3825-import QtQuick 2.0
3826+import QtQuick 2.4
3827 import Ubuntu.Components 1.2
3828 import QtTest 1.0
3829 import "../../../../qml/Dash/ScopeSettings"
3830
3831=== modified file 'tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingString.qml'
3832--- tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingString.qml 2015-10-08 09:07:28 +0000
3833+++ tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingString.qml 2015-10-08 09:07:28 +0000
3834@@ -14,7 +14,7 @@
3835 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3836 */
3837
3838-import QtQuick 2.0
3839+import QtQuick 2.4
3840 import Ubuntu.Components 1.2
3841 import QtTest 1.0
3842 import "../../../../qml/Dash/ScopeSettings"
3843
3844=== modified file 'tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingsWidgetFactory.qml'
3845--- tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingsWidgetFactory.qml 2015-10-08 09:07:28 +0000
3846+++ tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingsWidgetFactory.qml 2015-10-08 09:07:28 +0000
3847@@ -14,7 +14,7 @@
3848 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3849 */
3850
3851-import QtQuick 2.0
3852+import QtQuick 2.4
3853 import Ubuntu.Components 1.2
3854 import QtTest 1.0
3855 import "../../../../qml/Dash/ScopeSettings"
3856
3857=== modified file 'tests/qmltests/Dash/tst_Card.qml'
3858--- tests/qmltests/Dash/tst_Card.qml 2015-10-08 09:07:28 +0000
3859+++ tests/qmltests/Dash/tst_Card.qml 2015-10-08 09:07:28 +0000
3860@@ -14,7 +14,7 @@
3861 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3862 */
3863
3864-import QtQuick 2.0
3865+import QtQuick 2.4
3866 import QtTest 1.0
3867 import Ubuntu.Components 1.2
3868 import Unity.Test 0.1 as UT
3869
3870=== modified file 'tests/qmltests/Dash/tst_CardBenchmark.qml'
3871--- tests/qmltests/Dash/tst_CardBenchmark.qml 2015-10-08 09:07:28 +0000
3872+++ tests/qmltests/Dash/tst_CardBenchmark.qml 2015-10-08 09:07:28 +0000
3873@@ -14,7 +14,7 @@
3874 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3875 */
3876
3877-import QtQuick 2.0
3878+import QtQuick 2.4
3879 import QtTest 1.0
3880 import Ubuntu.Components 1.2
3881 import Unity.Test 0.1 as UT
3882
3883=== modified file 'tests/qmltests/Dash/tst_CardTool.qml'
3884--- tests/qmltests/Dash/tst_CardTool.qml 2015-10-08 09:07:28 +0000
3885+++ tests/qmltests/Dash/tst_CardTool.qml 2015-10-08 09:07:28 +0000
3886@@ -14,7 +14,7 @@
3887 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3888 */
3889
3890-import QtQuick 2.0
3891+import QtQuick 2.4
3892 import QtTest 1.0
3893 import Ubuntu.Components 1.2
3894 import Unity.Test 0.1 as UT
3895
3896=== modified file 'tests/qmltests/Dash/tst_Dash.qml'
3897--- tests/qmltests/Dash/tst_Dash.qml 2015-10-08 09:07:28 +0000
3898+++ tests/qmltests/Dash/tst_Dash.qml 2015-10-08 09:07:28 +0000
3899@@ -14,7 +14,7 @@
3900 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3901 */
3902
3903-import QtQuick 2.0
3904+import QtQuick 2.4
3905 import QtTest 1.0
3906 import "../../../qml/Dash"
3907 import Ubuntu.Components 1.2
3908
3909=== modified file 'tests/qmltests/Dash/tst_DashContent.qml'
3910--- tests/qmltests/Dash/tst_DashContent.qml 2015-10-08 09:07:28 +0000
3911+++ tests/qmltests/Dash/tst_DashContent.qml 2015-10-08 09:07:28 +0000
3912@@ -14,7 +14,7 @@
3913 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3914 */
3915
3916-import QtQuick 2.0
3917+import QtQuick 2.4
3918 import QtTest 1.0
3919 import "../../../qml/Dash"
3920 import "../../../qml/Components"
3921
3922=== modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
3923--- tests/qmltests/Dash/tst_GenericScopeView.qml 2015-10-08 09:07:28 +0000
3924+++ tests/qmltests/Dash/tst_GenericScopeView.qml 2015-10-08 09:07:28 +0000
3925@@ -14,7 +14,7 @@
3926 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3927 */
3928
3929-import QtQuick 2.0
3930+import QtQuick 2.4
3931 import QtTest 1.0
3932 import Unity 0.2
3933 import ".."
3934
3935=== modified file 'tests/qmltests/Dash/tst_PageHeader.qml'
3936--- tests/qmltests/Dash/tst_PageHeader.qml 2015-10-08 09:07:28 +0000
3937+++ tests/qmltests/Dash/tst_PageHeader.qml 2015-10-08 09:07:28 +0000
3938@@ -14,7 +14,7 @@
3939 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3940 */
3941
3942-import QtQuick 2.0
3943+import QtQuick 2.4
3944 import QtTest 1.0
3945 import ".."
3946 import "../../../qml/Dash"
3947
3948=== modified file 'tests/qmltests/Dash/tst_PreviewListView.qml'
3949--- tests/qmltests/Dash/tst_PreviewListView.qml 2015-10-08 09:07:28 +0000
3950+++ tests/qmltests/Dash/tst_PreviewListView.qml 2015-10-08 09:07:28 +0000
3951@@ -14,7 +14,7 @@
3952 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3953 */
3954
3955-import QtQuick 2.0
3956+import QtQuick 2.4
3957 import QtTest 1.0
3958 import Ubuntu.Components 1.2
3959 import "../../../qml/Dash"
3960
3961=== modified file 'tests/qmltests/Greeter/TestView.qml'
3962--- tests/qmltests/Greeter/TestView.qml 2015-10-08 09:07:28 +0000
3963+++ tests/qmltests/Greeter/TestView.qml 2015-10-08 09:07:28 +0000
3964@@ -14,7 +14,7 @@
3965 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3966 */
3967
3968-import QtQuick 2.3
3969+import QtQuick 2.4
3970 import Ubuntu.Components 1.2
3971 import "../Components"
3972
3973
3974=== modified file 'tests/qmltests/Greeter/tst_Clock.qml'
3975--- tests/qmltests/Greeter/tst_Clock.qml 2015-10-08 09:07:28 +0000
3976+++ tests/qmltests/Greeter/tst_Clock.qml 2015-10-08 09:07:28 +0000
3977@@ -14,7 +14,7 @@
3978 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3979 */
3980
3981-import QtQuick 2.0
3982+import QtQuick 2.4
3983 import QtTest 1.0
3984 import ".."
3985 import "../../../qml/Greeter"
3986
3987=== modified file 'tests/qmltests/Greeter/tst_Greeter.qml'
3988--- tests/qmltests/Greeter/tst_Greeter.qml 2015-10-08 09:07:28 +0000
3989+++ tests/qmltests/Greeter/tst_Greeter.qml 2015-10-08 09:07:28 +0000
3990@@ -14,7 +14,7 @@
3991 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3992 */
3993
3994-import QtQuick 2.0
3995+import QtQuick 2.4
3996 import QtTest 1.0
3997 import ".."
3998 import "../../../qml/Greeter"
3999
4000=== modified file 'tests/qmltests/Greeter/tst_Infographics.qml'
4001--- tests/qmltests/Greeter/tst_Infographics.qml 2015-10-08 09:07:28 +0000
4002+++ tests/qmltests/Greeter/tst_Infographics.qml 2015-10-08 09:07:28 +0000
4003@@ -14,7 +14,7 @@
4004 * along with this program. If not, see <http://www.gnu.org/licenses/>.
4005 */
4006
4007-import QtQuick 2.0
4008+import QtQuick 2.4
4009 import QtTest 1.0
4010 import ".."
4011 import "../../../qml/Greeter"
4012
4013=== modified file 'tests/qmltests/Greeter/tst_NarrowView.qml'
4014--- tests/qmltests/Greeter/tst_NarrowView.qml 2015-10-08 09:07:28 +0000
4015+++ tests/qmltests/Greeter/tst_NarrowView.qml 2015-10-08 09:07:28 +0000
4016@@ -14,7 +14,7 @@
4017 * along with this program. If not, see <http://www.gnu.org/licenses/>.
4018 */
4019
4020-import QtQuick 2.0
4021+import QtQuick 2.4
4022 import QtTest 1.0
4023 import ".."
4024 import "../../../qml/Greeter"
4025
4026=== modified file 'tests/qmltests/Greeter/tst_WideView.qml'
4027--- tests/qmltests/Greeter/tst_WideView.qml 2015-10-08 09:07:28 +0000
4028+++ tests/qmltests/Greeter/tst_WideView.qml 2015-10-08 09:07:28 +0000
4029@@ -14,7 +14,7 @@
4030 * along with this program. If not, see <http://www.gnu.org/licenses/>.
4031 */
4032
4033-import QtQuick 2.0
4034+import QtQuick 2.4
4035 import QtTest 1.0
4036 import ".."
4037 import "../../../qml/Greeter"
4038
4039=== modified file 'tests/qmltests/Launcher/tst_Launcher.qml'
4040--- tests/qmltests/Launcher/tst_Launcher.qml 2015-10-08 09:07:28 +0000
4041+++ tests/qmltests/Launcher/tst_Launcher.qml 2015-10-08 09:07:28 +0000
4042@@ -14,7 +14,7 @@
4043 * along with this program. If not, see <http://www.gnu.org/licenses/>.
4044 */
4045
4046-import QtQuick 2.0
4047+import QtQuick 2.4
4048 import QtQuick.Layouts 1.1
4049 import QtTest 1.0
4050 import Unity.Test 0.1
4051
4052=== modified file 'tests/qmltests/Notifications/tst_OptionToggle.qml'
4053--- tests/qmltests/Notifications/tst_OptionToggle.qml 2015-10-08 09:07:28 +0000
4054+++ tests/qmltests/Notifications/tst_OptionToggle.qml 2015-10-08 09:07:28 +0000
4055@@ -17,7 +17,7 @@
4056 * Mirco Mueller <mirco.mueller@canonical.com>
4057 */
4058
4059-import QtQuick 2.0
4060+import QtQuick 2.4
4061 import QtTest 1.0
4062 import ".."
4063 import "../../../qml/Notifications"
4064
4065=== modified file 'tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml'
4066--- tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml 2015-10-08 09:07:28 +0000
4067+++ tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml 2015-10-08 09:07:28 +0000
4068@@ -14,7 +14,7 @@
4069 * along with this program. If not, see <http://www.gnu.org/licenses/>.
4070 */
4071
4072-import QtQuick 2.0
4073+import QtQuick 2.4
4074 import QtTest 1.0
4075 import ".."
4076 import "../../../qml/Notifications"
4077
4078=== modified file 'tests/qmltests/Panel/IndicatorTest.qml'
4079--- tests/qmltests/Panel/IndicatorTest.qml 2015-10-08 09:07:28 +0000
4080+++ tests/qmltests/Panel/IndicatorTest.qml 2015-10-08 09:07:28 +0000
4081@@ -14,7 +14,7 @@
4082 * along with this program. If not, see <http://www.gnu.org/licenses/>.
4083 */
4084
4085-import QtQuick 2.1
4086+import QtQuick 2.4
4087 import QtQuick.Layouts 1.1
4088 import QtTest 1.0
4089 import "../../../qml/Panel"
4090
4091=== modified file 'tests/qmltests/Panel/Indicators/tst_IndicatorsLight.qml'
4092--- tests/qmltests/Panel/Indicators/tst_IndicatorsLight.qml 2015-10-08 09:07:28 +0000
4093+++ tests/qmltests/Panel/Indicators/tst_IndicatorsLight.qml 2015-10-08 09:07:28 +0000
4094@@ -14,7 +14,7 @@
4095 * along with this program. If not, see <http://www.gnu.org/licenses/>.
4096 */
4097
4098-import QtQuick 2.0
4099+import QtQuick 2.4
4100 import QtQuick.Layouts 1.1
4101 import Unity.Test 0.1 as UT
4102 import Unity.Indicators 0.1 as Indicators
4103
4104=== modified file 'tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml'
4105--- tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml 2015-04-01 15:03:40 +0000
4106+++ tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml 2015-10-08 09:07:28 +0000
4107@@ -14,7 +14,7 @@
4108 * along with this program. If not, see <http://www.gnu.org/licenses/>.
4109 */
4110
4111-import QtQuick 2.0
4112+import QtQuick 2.4
4113 import QtTest 1.0
4114 import Unity.Test 0.1 as UT
4115 import Ubuntu.Settings.Menus 0.1 as Menus
4116
4117=== modified file 'tests/qmltests/Panel/Indicators/tst_MessageMenuItemFactory.qml'
4118--- tests/qmltests/Panel/Indicators/tst_MessageMenuItemFactory.qml 2014-09-09 15:10:52 +0000
4119+++ tests/qmltests/Panel/Indicators/tst_MessageMenuItemFactory.qml 2015-10-08 09:07:28 +0000
4120@@ -14,7 +14,7 @@
4121 * along with this program. If not, see <http://www.gnu.org/licenses/>.
4122 */
4123
4124-import QtQuick 2.0
4125+import QtQuick 2.4
4126 import QtTest 1.0
4127 import Unity.Test 0.1 as UT
4128 import QMenuModel 0.1
4129
4130=== modified file 'tests/qmltests/Panel/tst_ActiveCallHint.qml'
4131--- tests/qmltests/Panel/tst_ActiveCallHint.qml 2014-10-01 19:53:01 +0000
4132+++ tests/qmltests/Panel/tst_ActiveCallHint.qml 2015-10-08 09:07:28 +0000
4133@@ -14,7 +14,7 @@
4134 * along with this program. If not, see <http://www.gnu.org/licenses/>.
4135 */
4136
4137-import QtQuick 2.0
4138+import QtQuick 2.4
4139 import QtTest 1.0
4140 import Unity.Test 0.1 as UT
4141 import Ubuntu.Telephony 0.1 as Telephony
4142
4143=== modified file 'tests/qmltests/Panel/tst_IndicatorItem.qml'
4144--- tests/qmltests/Panel/tst_IndicatorItem.qml 2015-10-08 09:07:28 +0000
4145+++ tests/qmltests/Panel/tst_IndicatorItem.qml 2015-10-08 09:07:28 +0000
4146@@ -14,7 +14,7 @@
4147 * along with this program. If not, see <http://www.gnu.org/licenses/>.
4148 */
4149
4150-import QtQuick 2.1
4151+import QtQuick 2.4
4152 import QtQuick.Layouts 1.1
4153 import QtTest 1.0
4154 import Ubuntu.Components 1.2
4155
4156=== modified file 'tests/qmltests/Panel/tst_IndicatorItemRow.qml'
4157--- tests/qmltests/Panel/tst_IndicatorItemRow.qml 2015-10-08 09:07:28 +0000
4158+++ tests/qmltests/Panel/tst_IndicatorItemRow.qml 2015-10-08 09:07:28 +0000
4159@@ -14,7 +14,7 @@
4160 * along with this program. If not, see <http://www.gnu.org/licenses/>.
4161 */
4162
4163-import QtQuick 2.1
4164+import QtQuick 2.4
4165 import QtQuick.Layouts 1.1
4166 import QtTest 1.0
4167 import "../../../qml/Panel"
4168
4169=== modified file 'tests/qmltests/Panel/tst_IndicatorPage.qml'
4170--- tests/qmltests/Panel/tst_IndicatorPage.qml 2014-10-31 17:07:08 +0000
4171+++ tests/qmltests/Panel/tst_IndicatorPage.qml 2015-10-08 09:07:28 +0000
4172@@ -14,7 +14,7 @@
4173 * along with this program. If not, see <http://www.gnu.org/licenses/>.
4174 */
4175
4176-import QtQuick 2.0
4177+import QtQuick 2.4
4178 import QtTest 1.0
4179 import Unity.Test 0.1 as UT
4180 import Unity.Indicators 0.1 as Indicators
4181
4182=== modified file 'tests/qmltests/Panel/tst_IndicatorsBar.qml'
4183--- tests/qmltests/Panel/tst_IndicatorsBar.qml 2015-10-08 09:07:28 +0000
4184+++ tests/qmltests/Panel/tst_IndicatorsBar.qml 2015-10-08 09:07:28 +0000
4185@@ -14,7 +14,7 @@
4186 * along with this program. If not, see <http://www.gnu.org/licenses/>.
4187 */
4188
4189-import QtQuick 2.1
4190+import QtQuick 2.4
4191 import QtQuick.Layouts 1.1
4192 import QtTest 1.0
4193 import "../../../qml/Panel"
4194
4195=== modified file 'tests/qmltests/Panel/tst_IndicatorsMenu.qml'
4196--- tests/qmltests/Panel/tst_IndicatorsMenu.qml 2015-10-08 09:07:28 +0000
4197+++ tests/qmltests/Panel/tst_IndicatorsMenu.qml 2015-10-08 09:07:28 +0000
4198@@ -14,7 +14,7 @@
4199 * along with this program. If not, see <http://www.gnu.org/licenses/>.
4200 */
4201
4202-import QtQuick 2.1
4203+import QtQuick 2.4
4204 import QtQuick.Layouts 1.1
4205 import QtTest 1.0
4206 import "../../../qml/Panel"
4207
4208=== modified file 'tests/qmltests/Panel/tst_MenuContent.qml'
4209--- tests/qmltests/Panel/tst_MenuContent.qml 2015-01-21 15:47:20 +0000
4210+++ tests/qmltests/Panel/tst_MenuContent.qml 2015-10-08 09:07:28 +0000
4211@@ -14,7 +14,7 @@
4212 * along with this program. If not, see <http://www.gnu.org/licenses/>.
4213 */
4214
4215-import QtQuick 2.0
4216+import QtQuick 2.4
4217 import QtTest 1.0
4218 import Unity.Test 0.1 as UT
4219 import "../../../qml/Panel"
4220
4221=== modified file 'tests/qmltests/Panel/tst_Panel.qml'
4222--- tests/qmltests/Panel/tst_Panel.qml 2015-10-08 09:07:28 +0000
4223+++ tests/qmltests/Panel/tst_Panel.qml 2015-10-08 09:07:28 +0000
4224@@ -14,7 +14,7 @@
4225 * along with this program. If not, see <http://www.gnu.org/licenses/>.
4226 */
4227
4228-import QtQuick 2.1
4229+import QtQuick 2.4
4230 import QtQuick.Layouts 1.1
4231 import QtTest 1.0
4232 import Unity.Test 0.1
4233
4234=== modified file 'tests/qmltests/Stages/ApplicationCheckBox.qml'
4235--- tests/qmltests/Stages/ApplicationCheckBox.qml 2015-10-08 09:07:28 +0000
4236+++ tests/qmltests/Stages/ApplicationCheckBox.qml 2015-10-08 09:07:28 +0000
4237@@ -14,7 +14,7 @@
4238 * along with this program. If not, see <http://www.gnu.org/licenses/>.
4239 */
4240
4241-import QtQuick 2.0
4242+import QtQuick 2.4
4243 import QtQuick.Layouts 1.1
4244 import Ubuntu.Components 1.2
4245 import Unity.Application 0.1
4246
4247=== modified file 'tests/qmltests/Stages/RecursingChildSessionControl.qml'
4248--- tests/qmltests/Stages/RecursingChildSessionControl.qml 2015-10-08 09:07:28 +0000
4249+++ tests/qmltests/Stages/RecursingChildSessionControl.qml 2015-10-08 09:07:28 +0000
4250@@ -14,7 +14,7 @@
4251 * along with this program. If not, see <http://www.gnu.org/licenses/>.
4252 */
4253
4254-import QtQuick 2.1
4255+import QtQuick 2.4
4256 import QtQuick.Layouts 1.1
4257 import Ubuntu.Components 1.2
4258 import Unity.Application 0.1
4259
4260=== modified file 'tests/qmltests/Stages/tst_ApplicationWindow.qml'
4261--- tests/qmltests/Stages/tst_ApplicationWindow.qml 2015-10-08 09:07:28 +0000
4262+++ tests/qmltests/Stages/tst_ApplicationWindow.qml 2015-10-08 09:07:28 +0000
4263@@ -14,7 +14,7 @@
4264 * along with this program. If not, see <http://www.gnu.org/licenses/>.
4265 */
4266
4267-import QtQuick 2.1
4268+import QtQuick 2.4
4269 import QtQuick.Layouts 1.1
4270 import QtTest 1.0
4271 import Unity.Test 0.1 as UT
4272
4273=== modified file 'tests/qmltests/Stages/tst_DesktopStage.qml'
4274--- tests/qmltests/Stages/tst_DesktopStage.qml 2015-10-08 09:07:28 +0000
4275+++ tests/qmltests/Stages/tst_DesktopStage.qml 2015-10-08 09:07:28 +0000
4276@@ -14,7 +14,7 @@
4277 * along with this program. If not, see <http://www.gnu.org/licenses/>.
4278 */
4279
4280-import QtQuick 2.0
4281+import QtQuick 2.4
4282 import QtTest 1.0
4283 import Ubuntu.Components 1.2
4284 import Ubuntu.Components.ListItems 1.2 as ListItem
4285
4286=== modified file 'tests/qmltests/Stages/tst_PhoneStage.qml'
4287--- tests/qmltests/Stages/tst_PhoneStage.qml 2015-10-08 09:07:28 +0000
4288+++ tests/qmltests/Stages/tst_PhoneStage.qml 2015-10-08 09:07:28 +0000
4289@@ -14,7 +14,7 @@
4290 * along with this program. If not, see <http://www.gnu.org/licenses/>.
4291 */
4292
4293-import QtQuick 2.0
4294+import QtQuick 2.4
4295 import QtTest 1.0
4296 import Unity.Test 0.1 as UT
4297 import ".."
4298
4299=== modified file 'tests/qmltests/Stages/tst_SessionContainer.qml'
4300--- tests/qmltests/Stages/tst_SessionContainer.qml 2015-10-08 09:07:28 +0000
4301+++ tests/qmltests/Stages/tst_SessionContainer.qml 2015-10-08 09:07:28 +0000
4302@@ -14,7 +14,7 @@
4303 * along with this program. If not, see <http://www.gnu.org/licenses/>.
4304 */
4305
4306-import QtQuick 2.1
4307+import QtQuick 2.4
4308 import QtQuick.Layouts 1.1
4309 import QtTest 1.0
4310 import Unity.Test 0.1 as UT
4311
4312=== modified file 'tests/qmltests/Stages/tst_Splash.qml'
4313--- tests/qmltests/Stages/tst_Splash.qml 2015-10-08 09:07:28 +0000
4314+++ tests/qmltests/Stages/tst_Splash.qml 2015-10-08 09:07:28 +0000
4315@@ -14,7 +14,7 @@
4316 * along with this program. If not, see <http://www.gnu.org/licenses/>.
4317 */
4318
4319-import QtQuick 2.0
4320+import QtQuick 2.4
4321 import QtTest 1.0
4322 import Unity.Test 0.1 as UT
4323 import ".."
4324
4325=== modified file 'tests/qmltests/Stages/tst_SpreadDelegate.qml'
4326--- tests/qmltests/Stages/tst_SpreadDelegate.qml 2015-10-08 09:07:28 +0000
4327+++ tests/qmltests/Stages/tst_SpreadDelegate.qml 2015-10-08 09:07:28 +0000
4328@@ -14,7 +14,7 @@
4329 * along with this program. If not, see <http://www.gnu.org/licenses/>.
4330 */
4331
4332-import QtQuick 2.0
4333+import QtQuick 2.4
4334 import QtTest 1.0
4335 import Unity.Test 0.1 as UT
4336 import ".."
4337
4338=== modified file 'tests/qmltests/Stages/tst_SurfaceContainer.qml'
4339--- tests/qmltests/Stages/tst_SurfaceContainer.qml 2015-10-08 09:07:28 +0000
4340+++ tests/qmltests/Stages/tst_SurfaceContainer.qml 2015-10-08 09:07:28 +0000
4341@@ -14,7 +14,7 @@
4342 * along with this program. If not, see <http://www.gnu.org/licenses/>.
4343 */
4344
4345-import QtQuick 2.0
4346+import QtQuick 2.4
4347 import QtTest 1.0
4348 import Unity.Test 0.1
4349 import ".."
4350
4351=== modified file 'tests/qmltests/Stages/tst_TabletStage.qml'
4352--- tests/qmltests/Stages/tst_TabletStage.qml 2015-10-08 09:07:28 +0000
4353+++ tests/qmltests/Stages/tst_TabletStage.qml 2015-10-08 09:07:28 +0000
4354@@ -14,7 +14,7 @@
4355 * along with this program. If not, see <http://www.gnu.org/licenses/>.
4356 */
4357
4358-import QtQuick 2.0
4359+import QtQuick 2.4
4360 import QtTest 1.0
4361 import Ubuntu.Components 1.2
4362 import Ubuntu.Components.ListItems 1.2 as ListItem
4363
4364=== modified file 'tests/qmltests/Stages/tst_WindowMoveResizeArea.qml'
4365--- tests/qmltests/Stages/tst_WindowMoveResizeArea.qml 2015-10-08 09:07:28 +0000
4366+++ tests/qmltests/Stages/tst_WindowMoveResizeArea.qml 2015-10-08 09:07:28 +0000
4367@@ -14,7 +14,7 @@
4368 * along with this program. If not, see <http://www.gnu.org/licenses/>.
4369 */
4370
4371-import QtQuick 2.1
4372+import QtQuick 2.4
4373 import QtQuick.Layouts 1.1
4374 import QtTest 1.0
4375 import Unity.Test 0.1 as UT
4376
4377=== modified file 'tests/qmltests/Tutorial/tst_Tutorial.qml'
4378--- tests/qmltests/Tutorial/tst_Tutorial.qml 2015-10-08 09:07:28 +0000
4379+++ tests/qmltests/Tutorial/tst_Tutorial.qml 2015-10-08 09:07:28 +0000
4380@@ -14,7 +14,7 @@
4381 * along with this program. If not, see <http://www.gnu.org/licenses/>.
4382 */
4383
4384-import QtQuick 2.0
4385+import QtQuick 2.4
4386 import QtTest 1.0
4387 import AccountsService 0.1
4388 import IntegratedLightDM 0.1 as LightDM
4389
4390=== modified file 'tests/qmltests/Wizard/tst_Wizard.qml'
4391--- tests/qmltests/Wizard/tst_Wizard.qml 2015-10-08 09:07:28 +0000
4392+++ tests/qmltests/Wizard/tst_Wizard.qml 2015-10-08 09:07:28 +0000
4393@@ -14,7 +14,7 @@
4394 * along with this program. If not, see <http://www.gnu.org/licenses/>.
4395 */
4396
4397-import QtQuick 2.3
4398+import QtQuick 2.4
4399 import QtTest 1.0
4400 import AccountsService 0.1
4401 import MeeGo.QOfono 0.2
4402
4403=== modified file 'tests/qmltests/tst_OrientedShell.qml'
4404--- tests/qmltests/tst_OrientedShell.qml 2015-10-08 09:07:28 +0000
4405+++ tests/qmltests/tst_OrientedShell.qml 2015-10-08 09:07:28 +0000
4406@@ -14,7 +14,7 @@
4407 * along with this program. If not, see <http://www.gnu.org/licenses/>.
4408 */
4409
4410-import QtQuick 2.0
4411+import QtQuick 2.4
4412 import QtQuick.Layouts 1.1
4413 import QtTest 1.0
4414 import Ubuntu.Components 1.2
4415
4416=== modified file 'tests/qmltests/tst_Shell.qml'
4417--- tests/qmltests/tst_Shell.qml 2015-10-08 09:07:28 +0000
4418+++ tests/qmltests/tst_Shell.qml 2015-10-08 09:07:28 +0000
4419@@ -14,7 +14,7 @@
4420 * along with this program. If not, see <http://www.gnu.org/licenses/>.
4421 */
4422
4423-import QtQuick 2.0
4424+import QtQuick 2.4
4425 import QtTest 1.0
4426 import AccountsService 0.1
4427 import GSettings 1.0
4428
4429=== modified file 'tests/qmltests/tst_ShellWithPin.qml'
4430--- tests/qmltests/tst_ShellWithPin.qml 2015-10-08 09:07:28 +0000
4431+++ tests/qmltests/tst_ShellWithPin.qml 2015-10-08 09:07:28 +0000
4432@@ -14,7 +14,7 @@
4433 * along with this program. If not, see <http://www.gnu.org/licenses/>.
4434 */
4435
4436-import QtQuick 2.0
4437+import QtQuick 2.4
4438 import Ubuntu.Components 1.2
4439 import QtTest 1.0
4440 import AccountsService 0.1
4441
4442=== modified file 'tests/qmltests/utils/Unity/Test/MockObjectForInstanceOfTest.qml'
4443--- tests/qmltests/utils/Unity/Test/MockObjectForInstanceOfTest.qml 2013-06-05 22:03:08 +0000
4444+++ tests/qmltests/utils/Unity/Test/MockObjectForInstanceOfTest.qml 2015-10-08 09:07:28 +0000
4445@@ -14,7 +14,7 @@
4446 * along with this program. If not, see <http://www.gnu.org/licenses/>.
4447 */
4448
4449-import QtQuick 2.0
4450+import QtQuick 2.4
4451
4452 Rectangle {
4453 property int dummy
4454
4455=== modified file 'tests/qmltests/utils/Unity/Test/MockObjectForInstanceOfTestChild.qml'
4456--- tests/qmltests/utils/Unity/Test/MockObjectForInstanceOfTestChild.qml 2013-06-05 22:03:08 +0000
4457+++ tests/qmltests/utils/Unity/Test/MockObjectForInstanceOfTestChild.qml 2015-10-08 09:07:28 +0000
4458@@ -14,7 +14,7 @@
4459 * along with this program. If not, see <http://www.gnu.org/licenses/>.
4460 */
4461
4462-import QtQuick 2.0
4463+import QtQuick 2.4
4464
4465 MockObjectForInstanceOfTest {
4466 property int dummy2
4467
4468=== modified file 'tests/qmltests/utils/Unity/Test/tst_UnityTest.qml'
4469--- tests/qmltests/utils/Unity/Test/tst_UnityTest.qml 2015-05-01 12:48:49 +0000
4470+++ tests/qmltests/utils/Unity/Test/tst_UnityTest.qml 2015-10-08 09:07:28 +0000
4471@@ -15,7 +15,7 @@
4472 */
4473
4474
4475-import QtQuick 2.0
4476+import QtQuick 2.4
4477 import QtTest 1.0
4478 import Unity.Test 0.1
4479
4480
4481=== modified file 'tests/utils/modules/Unity/Test/MouseTouchEmulationCheckbox.qml'
4482--- tests/utils/modules/Unity/Test/MouseTouchEmulationCheckbox.qml 2015-10-08 09:07:28 +0000
4483+++ tests/utils/modules/Unity/Test/MouseTouchEmulationCheckbox.qml 2015-10-08 09:07:28 +0000
4484@@ -14,7 +14,7 @@
4485 * along with this program. If not, see <http://www.gnu.org/licenses/>.
4486 */
4487
4488-import QtQuick 2.0
4489+import QtQuick 2.4
4490 import QtQuick.Layouts 1.1
4491 import Ubuntu.Components 1.2
4492 import Unity.Test 0.1
4493
4494=== modified file 'tests/utils/modules/Unity/Test/TouchEventSequenceWrapper.cpp'
4495--- tests/utils/modules/Unity/Test/TouchEventSequenceWrapper.cpp 2015-02-17 15:46:05 +0000
4496+++ tests/utils/modules/Unity/Test/TouchEventSequenceWrapper.cpp 2015-10-08 09:07:28 +0000
4497@@ -27,12 +27,10 @@
4498 void TouchEventSequenceWrapper::commit(bool processEvents)
4499 {
4500 m_eventSequence.commit(processEvents);
4501-#if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0))
4502 if (m_item->window()) {
4503 QQuickWindowPrivate *wp = QQuickWindowPrivate::get(m_item->window());
4504 wp->flushDelayedTouchEvent();
4505 }
4506-#endif
4507 }
4508
4509 void TouchEventSequenceWrapper::move(int touchId, int x, int y)
4510
4511=== modified file 'tests/utils/modules/Unity/Test/UnityTestCase.qml'
4512--- tests/utils/modules/Unity/Test/UnityTestCase.qml 2015-10-08 09:07:28 +0000
4513+++ tests/utils/modules/Unity/Test/UnityTestCase.qml 2015-10-08 09:07:28 +0000
4514@@ -14,7 +14,7 @@
4515 * along with this program. If not, see <http://www.gnu.org/licenses/>.
4516 */
4517
4518-import QtQuick 2.0
4519+import QtQuick 2.4
4520 import QtTest 1.0
4521 import Ubuntu.Components 1.2
4522 import Unity.Test 0.1 as UT

Subscribers

People subscribed via source and target branches