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

Proposed by Albert Astals Cid
Status: Rejected
Rejected by: Michał Sawicz
Proposed branch: lp:~aacid/unity8/use_sdk12
Merge into: lp:unity8
Diff against target: 3305 lines (+397/-275)
239 files modified
plugins/Dash/CardAttributes.qml (+1/-1)
plugins/Dash/CardCreator.js (+1/-1)
plugins/Dash/ScopeStyle.qml (+1/-1)
qml/Components/Background.qml (+1/-1)
qml/Components/BaseCarouselDelegate.qml (+1/-1)
qml/Components/Carousel.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/Header.qml (+2/-2)
qml/Components/InputMethod.qml (+1/-1)
qml/Components/LazyImage.qml (+1/-1)
qml/Components/ListItems/Header.qml (+1/-1)
qml/Components/Lockscreen.qml (+2/-2)
qml/Components/PassphraseLockscreen.qml (+1/-1)
qml/Components/PinLockscreen.qml (+2/-2)
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/ScrollCalculator.qml (+1/-1)
qml/Components/ShellDialog.qml (+2/-2)
qml/Components/UbuntuShapeForItem.qml (+1/-1)
qml/Components/WindowControlButtons.qml (+1/-1)
qml/Components/ZoomableImage.qml (+1/-1)
qml/Dash/CardCarousel.qml (+1/-1)
qml/Dash/CardHorizontalList.qml (+1/-1)
qml/Dash/CardVerticalJournal.qml (+1/-1)
qml/Dash/Dash.qml (+1/-1)
qml/Dash/DashApplication.qml (+1/-3)
qml/Dash/DashCategoryBase.qml (+1/-1)
qml/Dash/DashContent.qml (+1/-1)
qml/Dash/DashContentTabBarStyle.qml (+1/-1)
qml/Dash/DashNavigation.qml (+1/-1)
qml/Dash/DashNavigationButton.qml (+1/-1)
qml/Dash/DashNavigationList.qml (+2/-2)
qml/Dash/GenericScopeView.qml (+1/-1)
qml/Dash/PageHeader.qml (+4/-4)
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/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/PreviewRatingEdit.qml (+1/-1)
qml/Dash/Previews/PreviewRatingInput.qml (+1/-1)
qml/Dash/Previews/PreviewRatingSingleDisplay.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/PreviewZoomableImage.qml (+1/-1)
qml/Dash/PullToRefreshScopeStyle.qml (+2/-2)
qml/Dash/ScopeSettings/ScopeSetting.qml (+1/-1)
qml/Dash/ScopeSettings/ScopeSettingBoolean.qml (+2/-2)
qml/Dash/ScopeSettings/ScopeSettingList.qml (+2/-2)
qml/Dash/ScopeSettings/ScopeSettingString.qml (+2/-2)
qml/Dash/ScopeSettingsPage.qml (+1/-1)
qml/Dash/ScopesListCategory.qml (+1/-1)
qml/Dash/ScopesListCategoryItem.qml (+1/-1)
qml/Greeter/Clock.qml (+1/-1)
qml/Greeter/CoverPage.qml (+1/-1)
qml/Greeter/Greeter.qml (+1/-1)
qml/Greeter/Infographics.qml (+1/-1)
qml/Greeter/LoginList.qml (+1/-1)
qml/Greeter/NarrowView.qml (+1/-1)
qml/Greeter/ObjectPositioner.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 (+2/-2)
qml/Notifications/Notification.qml (+1/-1)
qml/Notifications/NotificationMenuItemFactory.qml (+1/-1)
qml/Notifications/Notifications.qml (+1/-1)
qml/Notifications/OptionToggle.qml (+3/-3)
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/MenuItemFactory.qml (+1/-1)
qml/Panel/Indicators/MessageMenuItemFactory.qml (+1/-1)
qml/Panel/Indicators/ModemInfoItem.qml (+2/-2)
qml/Panel/Indicators/RoamingIndication.qml (+1/-1)
qml/Panel/Indicators/client/IndicatorRepresentation.qml (+2/-2)
qml/Panel/Indicators/client/IndicatorsClient.qml (+2/-2)
qml/Panel/Indicators/client/IndicatorsList.qml (+2/-2)
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/Rotation/RotationStates.qml (+1/-1)
qml/ScopeTool.qml (+2/-2)
qml/Shell.qml (+2/-2)
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/DesktopStage.qml (+1/-1)
qml/Stages/MainViewStyle.qml (+1/-1)
qml/Stages/PageHeadStyle.qml (+2/-2)
qml/Stages/PhoneStage.qml (+1/-1)
qml/Stages/ShimStage.qml (+1/-1)
qml/Stages/Splash.qml (+3/-3)
qml/Stages/SpreadDelegate.qml (+1/-1)
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 (+2/-2)
qml/Wizard/Page.qml (+1/-1)
qml/Wizard/Pages.qml (+1/-1)
qml/Wizard/Pages/10-welcome.qml (+2/-2)
qml/Wizard/Pages/20-sim.qml (+1/-1)
qml/Wizard/Pages/30-passwd-type.qml (+2/-2)
qml/Wizard/Pages/40-wifi.qml (+2/-2)
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/-0)
tests/autopilot/unity8/dash.py (+1/-1)
tests/plugins/Dash/tst_CroppedImageMinimumSourceSize.qml (+1/-1)
tests/plugins/Dash/tst_ScopeStyle.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/tst_DirectionalDragArea.qml (+1/-1)
tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.qml (+1/-1)
tests/plugins/Ubuntu/Gestures/tst_PressedOutsideNotifier.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_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_Rating.qml (+1/-1)
tests/qmltests/Components/tst_ResponsiveGridView.qml (+2/-2)
tests/qmltests/Components/tst_ResponsiveVerticalJournal.qml (+2/-2)
tests/qmltests/Components/tst_Showable.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_PreviewIconActions.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/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_CardCarousel.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_DashShell.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_SwipeToAct.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/tst_IndicatorItem.qml (+1/-1)
tests/qmltests/Panel/tst_IndicatorItemRow.qml (+1/-1)
tests/qmltests/Panel/tst_IndicatorsBar.qml (+1/-1)
tests/qmltests/Panel/tst_IndicatorsMenu.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 (+2/-2)
tests/qmltests/Stages/tst_DesktopStage.qml (+2/-2)
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 (+2/-2)
tests/qmltests/Stages/tst_SurfaceContainer.qml (+1/-1)
tests/qmltests/Stages/tst_TabletStage.qml (+2/-2)
tests/qmltests/Stages/tst_WindowMoveResizeArea.qml (+2/-2)
tests/qmltests/Tutorial/tst_Tutorial.qml (+1/-1)
tests/qmltests/Wizard/tst_Wizard.qml (+1/-1)
tests/qmltests/tst_OrientedShell.qml (+2/-2)
tests/qmltests/tst_Shell.qml (+2/-2)
tests/qmltests/tst_ShellWithPin.qml (+1/-1)
tests/sdk/CMakeLists.txt (+6/-0)
tests/sdk/check_sdk.py (+117/-0)
tests/utils/modules/Unity/Test/MouseTouchEmulationCheckbox.qml (+1/-1)
tests/utils/modules/Unity/Test/UnityTestCase.qml (+1/-1)
To merge this branch: bzr merge lp:~aacid/unity8/use_sdk12
Reviewer Review Type Date Requested Status
Michał Sawicz Disapprove
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+273182@code.launchpad.net

Commit message

Use SDK 1.2 across all files

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?
N/A

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

To post a comment you must log in.
lp:~aacid/unity8/use_sdk12 updated
1996. By Albert Astals Cid

Allow for import Ubuntu.Components.Themes 0.1

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1995
http://jenkins.qa.ubuntu.com/job/unity8-ci/6405/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4470
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/784
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1117/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/436
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1012
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1013
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/644
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/645
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3635
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4467
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4467/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23881
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/471
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/784
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/784/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23882

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1996
http://jenkins.qa.ubuntu.com/job/unity8-ci/6408/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4474
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/787
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1120
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/439
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1015
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1016
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/647
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/648
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3639
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4471
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4471/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23898
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/474
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/787
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/787/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23894

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

review: Needs Fixing (continuous-integration)
lp:~aacid/unity8/use_sdk12 updated
1997. By Albert Astals Cid

Merge

1998. By Albert Astals Cid

Fix tests

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1997
http://jenkins.qa.ubuntu.com/job/unity8-ci/6428/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4546
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/807
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1140
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/459
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1035
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1036
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/667
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/668
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3689
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4543
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4543/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24059
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/485
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/807
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/807/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24057

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1998
http://jenkins.qa.ubuntu.com/job/unity8-ci/6431/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4551
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/810
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1143
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/462
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1038
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1039
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/670
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/671
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3693
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4548
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4548/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24068
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/487
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/810
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/810/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24070

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Michael Zanetti (mzanetti) wrote :

According to my latest information, we will be targetting a switch to 1.3 for OTA-8, which would mean we could land the 1.3 branch right now.

Sorry for all the confusion and back-and-forth, but seems we don't need this one after all then :/

Revision history for this message
Albert Astals Cid (aacid) wrote :

I'd still like to go with this one since 1.3 breaks things for us at the moment, so my suggestion is move to 1.2+2.4 and then to 1.3+2.4

Revision history for this message
Michał Sawicz (saviq) wrote :

Going directly for 1.3 after all.

review: Disapprove

Unmerged revisions

1998. By Albert Astals Cid

Fix tests

1997. By Albert Astals Cid

Merge

1996. By Albert Astals Cid

Allow for import Ubuntu.Components.Themes 0.1

1995. By Albert Astals Cid

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=== added directory 'builddir'
2=== added directory 'builddir/tests'
3=== modified file 'plugins/Dash/CardAttributes.qml'
4--- plugins/Dash/CardAttributes.qml 2015-02-12 16:28:36 +0000
5+++ plugins/Dash/CardAttributes.qml 2015-10-08 09:06:50 +0000
6@@ -16,7 +16,7 @@
7
8 import QtQuick 2.2
9 import QtQuick.Layouts 1.1
10-import Ubuntu.Components 1.1
11+import Ubuntu.Components 1.2
12
13 GridLayout {
14 id: grid
15
16=== modified file 'plugins/Dash/CardCreator.js'
17--- plugins/Dash/CardCreator.js 2015-08-31 13:29:42 +0000
18+++ plugins/Dash/CardCreator.js 2015-10-08 09:06:50 +0000
19@@ -698,7 +698,7 @@
20
21 function createCardComponent(parent, template, components) {
22 var imports = 'import QtQuick 2.2; \n\
23- import Ubuntu.Components 1.1; \n\
24+ import Ubuntu.Components 1.2; \n\
25 import Ubuntu.Settings.Components 0.1; \n\
26 import Dash 0.1;\n\
27 import Utils 0.1;\n';
28
29=== modified file 'plugins/Dash/ScopeStyle.qml'
30--- plugins/Dash/ScopeStyle.qml 2014-11-20 11:44:44 +0000
31+++ plugins/Dash/ScopeStyle.qml 2015-10-08 09:06:50 +0000
32@@ -16,7 +16,7 @@
33
34 import QtQuick 2.2
35 import Utils 0.1
36-import Ubuntu.Components 1.1
37+import Ubuntu.Components 1.2
38
39 /*! \brief Helper for processing scope customization options.
40
41
42=== modified file 'qml/Components/Background.qml'
43--- qml/Components/Background.qml 2014-08-29 08:47:21 +0000
44+++ qml/Components/Background.qml 2015-10-08 09:06:50 +0000
45@@ -15,7 +15,7 @@
46 */
47
48 import QtQuick 2.0
49-import Ubuntu.Components 1.1
50+import Ubuntu.Components 1.2
51 import Utils 0.1 as Utils
52
53 Loader {
54
55=== modified file 'qml/Components/BaseCarouselDelegate.qml'
56--- qml/Components/BaseCarouselDelegate.qml 2014-07-08 17:49:18 +0000
57+++ qml/Components/BaseCarouselDelegate.qml 2015-10-08 09:06:50 +0000
58@@ -15,7 +15,7 @@
59 */
60
61 import QtQuick 2.0
62-import Ubuntu.Components 0.1
63+import Ubuntu.Components 1.2
64
65 /*!
66 \brief Base delegate for use with the Carousel component
67
68=== modified file 'qml/Components/Carousel.qml'
69--- qml/Components/Carousel.qml 2015-08-28 12:39:43 +0000
70+++ qml/Components/Carousel.qml 2015-10-08 09:06:50 +0000
71@@ -15,7 +15,7 @@
72 */
73
74 import QtQuick 2.3
75-import Ubuntu.Components 0.1
76+import Ubuntu.Components 1.2
77 import "carousel.js" as CarouselJS
78
79 /*! The Carousel component presents the items of a model in a carousel view. It's similar to a
80
81=== modified file 'qml/Components/DelayedLockscreen.qml'
82--- qml/Components/DelayedLockscreen.qml 2015-02-12 14:48:06 +0000
83+++ qml/Components/DelayedLockscreen.qml 2015-10-08 09:06:50 +0000
84@@ -15,7 +15,7 @@
85 */
86
87 import QtQuick 2.0
88-import Ubuntu.Components 0.1
89+import Ubuntu.Components 1.2
90 import "../Components"
91
92 Item {
93
94=== modified file 'qml/Components/Dialogs.qml'
95--- qml/Components/Dialogs.qml 2015-09-02 09:30:32 +0000
96+++ qml/Components/Dialogs.qml 2015-10-08 09:06:50 +0000
97@@ -18,7 +18,7 @@
98
99 import Unity.Application 0.1
100 import Unity.Session 0.1
101-import Ubuntu.Components 1.1
102+import Ubuntu.Components 1.2
103 import GlobalShortcut 1.0
104 import "../Greeter"
105
106
107=== modified file 'qml/Components/DragHandle.qml'
108--- qml/Components/DragHandle.qml 2015-04-10 21:16:37 +0000
109+++ qml/Components/DragHandle.qml 2015-10-08 09:06:50 +0000
110@@ -15,7 +15,7 @@
111 */
112
113 import QtQuick 2.0
114-import Ubuntu.Components 0.1
115+import Ubuntu.Components 1.2
116 import Ubuntu.Gestures 0.1
117
118 /*
119
120=== modified file 'qml/Components/DraggingArea.qml'
121--- qml/Components/DraggingArea.qml 2014-07-11 09:22:59 +0000
122+++ qml/Components/DraggingArea.qml 2015-10-08 09:06:50 +0000
123@@ -15,7 +15,7 @@
124 */
125
126 import QtQuick 2.0
127-import Ubuntu.Components 0.1
128+import Ubuntu.Components 1.2
129
130 MouseArea {
131 id: draggingArea
132
133=== modified file 'qml/Components/EdgeDragEvaluator.qml'
134--- qml/Components/EdgeDragEvaluator.qml 2015-04-27 15:30:18 +0000
135+++ qml/Components/EdgeDragEvaluator.qml 2015-10-08 09:06:50 +0000
136@@ -15,7 +15,7 @@
137 */
138
139 import QtQuick 2.0
140-import Ubuntu.Components 0.1
141+import Ubuntu.Components 1.2
142 import Ubuntu.Gestures 0.1
143
144 /*
145
146=== modified file 'qml/Components/Header.qml'
147--- qml/Components/Header.qml 2014-08-01 16:13:53 +0000
148+++ qml/Components/Header.qml 2015-10-08 09:06:50 +0000
149@@ -14,8 +14,8 @@
150 * along with this program. If not, see <http://www.gnu.org/licenses/>.
151 */
152
153-import Ubuntu.Components 1.1
154-import Ubuntu.Components.Themes.Ambiance 1.1
155+import Ubuntu.Components 1.2
156+import Ubuntu.Components.Themes.Ambiance 1.2
157
158 PageHeadStyle {
159 id: root
160
161=== modified file 'qml/Components/InputMethod.qml'
162--- qml/Components/InputMethod.qml 2015-08-06 12:47:28 +0000
163+++ qml/Components/InputMethod.qml 2015-10-08 09:06:50 +0000
164@@ -16,7 +16,7 @@
165
166 import QtQuick 2.0
167 import Unity.Application 0.1
168-import Ubuntu.Components 0.1
169+import Ubuntu.Components 1.2
170 import Ubuntu.Gestures 0.1
171
172 Item {
173
174=== modified file 'qml/Components/LazyImage.qml'
175--- qml/Components/LazyImage.qml 2014-09-29 20:55:54 +0000
176+++ qml/Components/LazyImage.qml 2015-10-08 09:06:50 +0000
177@@ -18,7 +18,7 @@
178 */
179
180 import QtQuick 2.0
181-import Ubuntu.Components 0.1
182+import Ubuntu.Components 1.2
183
184 Item {
185 id: root
186
187=== modified file 'qml/Components/ListItems/Header.qml'
188--- qml/Components/ListItems/Header.qml 2014-07-16 16:30:15 +0000
189+++ qml/Components/ListItems/Header.qml 2015-10-08 09:06:50 +0000
190@@ -16,7 +16,7 @@
191
192 import QtQuick 2.0
193 import QtQuick.Layouts 1.1
194-import Ubuntu.Components 0.1
195+import Ubuntu.Components 1.2
196
197 Item {
198 property alias text: label.text
199
200=== modified file 'qml/Components/Lockscreen.qml'
201--- qml/Components/Lockscreen.qml 2015-03-18 17:27:30 +0000
202+++ qml/Components/Lockscreen.qml 2015-10-08 09:06:50 +0000
203@@ -15,8 +15,8 @@
204 */
205
206 import QtQuick 2.0
207-import Ubuntu.Components 1.0
208-import Ubuntu.Components.Popups 1.0
209+import Ubuntu.Components 1.2
210+import Ubuntu.Components.Popups 1.2
211 import Ubuntu.Telephony 0.1 as Telephony
212
213 Showable {
214
215=== modified file 'qml/Components/PassphraseLockscreen.qml'
216--- qml/Components/PassphraseLockscreen.qml 2015-03-18 17:27:30 +0000
217+++ qml/Components/PassphraseLockscreen.qml 2015-10-08 09:06:50 +0000
218@@ -15,7 +15,7 @@
219 */
220
221 import QtQuick 2.0
222-import Ubuntu.Components 0.1
223+import Ubuntu.Components 1.2
224 import "../Components"
225
226 Item {
227
228=== modified file 'qml/Components/PinLockscreen.qml'
229--- qml/Components/PinLockscreen.qml 2015-05-28 07:42:09 +0000
230+++ qml/Components/PinLockscreen.qml 2015-10-08 09:06:50 +0000
231@@ -15,8 +15,8 @@
232 */
233
234 import QtQuick 2.0
235-import Ubuntu.Components 0.1
236-import Ubuntu.Components.ListItems 0.1
237+import Ubuntu.Components 1.2
238+import Ubuntu.Components.ListItems 1.2
239 import "../Components"
240
241 Item {
242
243=== modified file 'qml/Components/PinPadButton.qml'
244--- qml/Components/PinPadButton.qml 2015-03-18 17:27:30 +0000
245+++ qml/Components/PinPadButton.qml 2015-10-08 09:06:50 +0000
246@@ -15,7 +15,7 @@
247 */
248
249 import QtQuick 2.0
250-import Ubuntu.Components 1.1
251+import Ubuntu.Components 1.2
252
253 AbstractButton {
254 id: root
255
256=== modified file 'qml/Components/Rating.qml'
257--- qml/Components/Rating.qml 2014-02-13 17:00:06 +0000
258+++ qml/Components/Rating.qml 2015-10-08 09:06:50 +0000
259@@ -15,7 +15,7 @@
260 */
261
262 import QtQuick 2.0
263-import Ubuntu.Components 0.1
264+import Ubuntu.Components 1.2
265
266 /*! Rating widget bar. */
267
268
269=== modified file 'qml/Components/RatingStyle.qml'
270--- qml/Components/RatingStyle.qml 2014-02-13 17:00:06 +0000
271+++ qml/Components/RatingStyle.qml 2015-10-08 09:06:50 +0000
272@@ -15,7 +15,7 @@
273 */
274
275 import QtQuick 2.0
276-import Ubuntu.Components 0.1
277+import Ubuntu.Components 1.2
278
279 Row {
280 anchors.fill: parent
281
282=== modified file 'qml/Components/ResponsiveGridView.qml'
283--- qml/Components/ResponsiveGridView.qml 2014-10-23 11:59:22 +0000
284+++ qml/Components/ResponsiveGridView.qml 2015-10-08 09:06:50 +0000
285@@ -15,7 +15,7 @@
286 */
287
288 import QtQuick 2.3
289-import Ubuntu.Components 0.1
290+import Ubuntu.Components 1.2
291
292 /*
293 Essentially a GridView where you can specify the maximum number of columns it can have.
294
295=== modified file 'qml/Components/ResponsiveVerticalJournal.qml'
296--- qml/Components/ResponsiveVerticalJournal.qml 2015-05-12 10:05:52 +0000
297+++ qml/Components/ResponsiveVerticalJournal.qml 2015-10-08 09:06:50 +0000
298@@ -15,7 +15,7 @@
299 */
300
301 import QtQuick 2.0
302-import Ubuntu.Components 0.1
303+import Ubuntu.Components 1.2
304 import "../Components"
305 import Dash 0.1
306
307
308=== modified file 'qml/Components/ScrollCalculator.qml'
309--- qml/Components/ScrollCalculator.qml 2014-10-13 15:09:46 +0000
310+++ qml/Components/ScrollCalculator.qml 2015-10-08 09:06:50 +0000
311@@ -15,7 +15,7 @@
312 */
313
314 import QtQuick 2.2
315-import Ubuntu.Components 1.1
316+import Ubuntu.Components 1.2
317
318 Item {
319 id: scrollArea
320
321=== modified file 'qml/Components/ShellDialog.qml'
322--- qml/Components/ShellDialog.qml 2015-08-24 15:39:53 +0000
323+++ qml/Components/ShellDialog.qml 2015-10-08 09:06:50 +0000
324@@ -16,8 +16,8 @@
325
326 import QtQuick 2.0
327
328-import Ubuntu.Components 1.1
329-import Ubuntu.Components.Popups 0.1
330+import Ubuntu.Components 1.2
331+import Ubuntu.Components.Popups 1.2
332
333 /*
334 A Dialog configured for use as a proper in-scene Dialog
335
336=== modified file 'qml/Components/UbuntuShapeForItem.qml'
337--- qml/Components/UbuntuShapeForItem.qml 2014-10-06 07:39:42 +0000
338+++ qml/Components/UbuntuShapeForItem.qml 2015-10-08 09:06:50 +0000
339@@ -15,7 +15,7 @@
340 */
341
342 import QtQuick 2.0
343-import Ubuntu.Components 0.1
344+import Ubuntu.Components 1.2
345
346 /* FIXME: This component is duplicating the UbuntuShape from the SDK, but shapes more
347 * general (Item-based) components. This ability should be incorporated into the SDK's
348
349=== modified file 'qml/Components/WindowControlButtons.qml'
350--- qml/Components/WindowControlButtons.qml 2014-11-24 11:21:38 +0000
351+++ qml/Components/WindowControlButtons.qml 2015-10-08 09:06:50 +0000
352@@ -17,7 +17,7 @@
353 */
354
355 import QtQuick 2.3
356-import Ubuntu.Components 1.1
357+import Ubuntu.Components 1.2
358
359 Row {
360 id: root
361
362=== modified file 'qml/Components/ZoomableImage.qml'
363--- qml/Components/ZoomableImage.qml 2015-05-06 15:05:06 +0000
364+++ qml/Components/ZoomableImage.qml 2015-10-08 09:06:50 +0000
365@@ -15,7 +15,7 @@
366 */
367
368 import QtQuick 2.0
369-import Ubuntu.Components 0.1
370+import Ubuntu.Components 1.2
371 import "../Components"
372
373 /*! \brief Zoomable for image.
374
375=== modified file 'qml/Dash/CardCarousel.qml'
376--- qml/Dash/CardCarousel.qml 2015-08-31 07:46:52 +0000
377+++ qml/Dash/CardCarousel.qml 2015-10-08 09:06:50 +0000
378@@ -15,7 +15,7 @@
379 */
380
381 import QtQuick 2.0
382-import Ubuntu.Components 0.1
383+import Ubuntu.Components 1.2
384 import "../Components"
385
386 DashRenderer {
387
388=== modified file 'qml/Dash/CardHorizontalList.qml'
389--- qml/Dash/CardHorizontalList.qml 2015-05-13 10:21:18 +0000
390+++ qml/Dash/CardHorizontalList.qml 2015-10-08 09:06:50 +0000
391@@ -15,7 +15,7 @@
392 */
393
394 import QtQuick 2.3
395-import Ubuntu.Components 1.1
396+import Ubuntu.Components 1.2
397 import "../Components"
398
399 DashRenderer {
400
401=== modified file 'qml/Dash/CardVerticalJournal.qml'
402--- qml/Dash/CardVerticalJournal.qml 2015-05-13 10:21:18 +0000
403+++ qml/Dash/CardVerticalJournal.qml 2015-10-08 09:06:50 +0000
404@@ -15,7 +15,7 @@
405 */
406
407 import QtQuick 2.0
408-import Ubuntu.Components 0.1
409+import Ubuntu.Components 1.2
410 import "../Components"
411
412 DashRenderer {
413
414=== modified file 'qml/Dash/Dash.qml'
415--- qml/Dash/Dash.qml 2015-08-31 10:24:42 +0000
416+++ qml/Dash/Dash.qml 2015-10-08 09:06:50 +0000
417@@ -15,7 +15,7 @@
418 */
419
420 import QtQuick 2.2
421-import Ubuntu.Components 0.1
422+import Ubuntu.Components 1.2
423 import Ubuntu.Gestures 0.1
424 import Unity 0.2
425 import Utils 0.1
426
427=== modified file 'qml/Dash/DashApplication.qml'
428--- qml/Dash/DashApplication.qml 2015-05-12 14:39:11 +0000
429+++ qml/Dash/DashApplication.qml 2015-10-08 09:06:50 +0000
430@@ -15,15 +15,13 @@
431 */
432
433 import QtQuick 2.2
434-import Ubuntu.Components 1.0
435+import Ubuntu.Components 1.2
436 import Ubuntu.Thumbnailer 0.1 // Register support for image://thumbnailer/ and image://albumart/
437
438 MainView {
439 implicitWidth: units.gu(40)
440 implicitHeight: units.gu(68)
441
442- useDeprecatedToolbar: false
443-
444 Dash {
445 anchors.fill: parent
446 }
447
448=== modified file 'qml/Dash/DashCategoryBase.qml'
449--- qml/Dash/DashCategoryBase.qml 2014-10-09 17:41:49 +0000
450+++ qml/Dash/DashCategoryBase.qml 2015-10-08 09:06:50 +0000
451@@ -15,7 +15,7 @@
452 */
453
454 import QtQuick 2.0
455-import Ubuntu.Components 0.1
456+import Ubuntu.Components 1.2
457
458 Item {
459 width: parent.width
460
461=== modified file 'qml/Dash/DashContent.qml'
462--- qml/Dash/DashContent.qml 2015-04-29 07:39:58 +0000
463+++ qml/Dash/DashContent.qml 2015-10-08 09:06:50 +0000
464@@ -15,7 +15,7 @@
465 */
466
467 import QtQuick 2.0
468-import Ubuntu.Components 0.1
469+import Ubuntu.Components 1.2
470 import Unity 0.2
471 import Utils 0.1
472 import "../Components"
473
474=== modified file 'qml/Dash/DashContentTabBarStyle.qml'
475--- qml/Dash/DashContentTabBarStyle.qml 2014-02-19 13:30:38 +0000
476+++ qml/Dash/DashContentTabBarStyle.qml 2015-10-08 09:06:50 +0000
477@@ -14,7 +14,7 @@
478 * along with this program. If not, see <http://www.gnu.org/licenses/>.
479 */
480
481-import Ubuntu.Components.Themes.Ambiance 0.1
482+import Ubuntu.Components.Themes.Ambiance 1.2
483
484 TabBarStyle {
485 indicatorImageSource: "graphics/tabbarchevron.png"
486
487=== modified file 'qml/Dash/DashNavigation.qml'
488--- qml/Dash/DashNavigation.qml 2015-01-05 15:08:04 +0000
489+++ qml/Dash/DashNavigation.qml 2015-10-08 09:06:50 +0000
490@@ -15,7 +15,7 @@
491 */
492
493 import QtQuick 2.2
494-import Ubuntu.Components 1.1
495+import Ubuntu.Components 1.2
496 import Dash 0.1
497 import "../Components"
498
499
500=== modified file 'qml/Dash/DashNavigationButton.qml'
501--- qml/Dash/DashNavigationButton.qml 2015-01-05 15:08:04 +0000
502+++ qml/Dash/DashNavigationButton.qml 2015-10-08 09:06:50 +0000
503@@ -15,7 +15,7 @@
504 */
505
506 import QtQuick 2.2
507-import Ubuntu.Components 1.1
508+import Ubuntu.Components 1.2
509
510 AbstractButton {
511 id: root
512
513=== modified file 'qml/Dash/DashNavigationList.qml'
514--- qml/Dash/DashNavigationList.qml 2015-07-06 04:41:44 +0000
515+++ qml/Dash/DashNavigationList.qml 2015-10-08 09:06:50 +0000
516@@ -15,8 +15,8 @@
517 */
518
519 import QtQuick 2.2
520-import Ubuntu.Components 1.1
521-import Ubuntu.Components.ListItems 0.1 as ListItem
522+import Ubuntu.Components 1.2
523+import Ubuntu.Components.ListItems 1.2 as ListItem
524 import "../Components"
525
526 Item {
527
528=== modified file 'qml/Dash/GenericScopeView.qml'
529--- qml/Dash/GenericScopeView.qml 2015-08-17 11:57:13 +0000
530+++ qml/Dash/GenericScopeView.qml 2015-10-08 09:06:50 +0000
531@@ -15,7 +15,7 @@
532 */
533
534 import QtQuick 2.0
535-import Ubuntu.Components 1.1
536+import Ubuntu.Components 1.2
537 import Utils 0.1
538 import Unity 0.2
539 import Dash 0.1
540
541=== modified file 'qml/Dash/PageHeader.qml'
542--- qml/Dash/PageHeader.qml 2015-03-13 10:07:57 +0000
543+++ qml/Dash/PageHeader.qml 2015-10-08 09:06:50 +0000
544@@ -15,10 +15,10 @@
545 */
546
547 import QtQuick 2.2
548-import Ubuntu.Components 1.1
549-import Ubuntu.Components.Themes.Ambiance 1.1
550-import Ubuntu.Components.Popups 1.0
551-import Ubuntu.Components.ListItems 1.0
552+import Ubuntu.Components 1.2
553+import Ubuntu.Components.Themes.Ambiance 1.2
554+import Ubuntu.Components.Popups 1.2
555+import Ubuntu.Components.ListItems 1.2
556 import "../Components"
557 import "../Components/SearchHistoryModel"
558
559
560=== modified file 'qml/Dash/PreviewListView.qml'
561--- qml/Dash/PreviewListView.qml 2015-09-14 11:07:25 +0000
562+++ qml/Dash/PreviewListView.qml 2015-10-08 09:06:50 +0000
563@@ -15,7 +15,7 @@
564 */
565
566 import QtQuick 2.0
567-import Ubuntu.Components 0.1
568+import Ubuntu.Components 1.2
569 import Unity 0.2
570 import "../Components"
571 import "Previews" as Previews
572
573=== modified file 'qml/Dash/Previews/Preview.qml'
574--- qml/Dash/Previews/Preview.qml 2015-08-24 11:20:41 +0000
575+++ qml/Dash/Previews/Preview.qml 2015-10-08 09:06:50 +0000
576@@ -15,7 +15,7 @@
577 */
578
579 import QtQuick 2.0
580-import Ubuntu.Components 0.1
581+import Ubuntu.Components 1.2
582
583 /*! \brief This component constructs the Preview UI.
584 *
585
586=== modified file 'qml/Dash/Previews/PreviewActionButton.qml'
587--- qml/Dash/Previews/PreviewActionButton.qml 2014-08-14 12:01:03 +0000
588+++ qml/Dash/Previews/PreviewActionButton.qml 2015-10-08 09:06:50 +0000
589@@ -15,7 +15,7 @@
590 */
591
592 import QtQuick 2.0
593-import Ubuntu.Components 1.1
594+import Ubuntu.Components 1.2
595
596 Button {
597 signal triggeredAction(var actionData)
598
599=== modified file 'qml/Dash/Previews/PreviewActionCombo.qml'
600--- qml/Dash/Previews/PreviewActionCombo.qml 2014-08-15 08:40:36 +0000
601+++ qml/Dash/Previews/PreviewActionCombo.qml 2015-10-08 09:06:50 +0000
602@@ -15,7 +15,7 @@
603 */
604
605 import QtQuick 2.0
606-import Ubuntu.Components 1.1
607+import Ubuntu.Components 1.2
608
609 Item {
610 id: root
611
612=== modified file 'qml/Dash/Previews/PreviewActions.qml'
613--- qml/Dash/Previews/PreviewActions.qml 2015-08-04 13:53:55 +0000
614+++ qml/Dash/Previews/PreviewActions.qml 2015-10-08 09:06:50 +0000
615@@ -15,7 +15,7 @@
616 */
617
618 import QtQuick 2.1
619-import Ubuntu.Components 1.1
620+import Ubuntu.Components 1.2
621
622 /*! This preview widget shows either one button, two buttons or one button
623 * and a combo button depending on the number of items in widgetData["actions"].
624
625=== modified file 'qml/Dash/Previews/PreviewAudioPlayback.qml'
626--- qml/Dash/Previews/PreviewAudioPlayback.qml 2015-08-03 14:27:48 +0000
627+++ qml/Dash/Previews/PreviewAudioPlayback.qml 2015-10-08 09:06:50 +0000
628@@ -16,7 +16,7 @@
629
630 import QtQuick 2.0
631 import QtMultimedia 5.0
632-import Ubuntu.Components 0.1
633+import Ubuntu.Components 1.2
634
635 /*! \brief Preview widget for audio tracks.
636
637
638=== modified file 'qml/Dash/Previews/PreviewCommentInput.qml'
639--- qml/Dash/Previews/PreviewCommentInput.qml 2015-08-24 03:46:15 +0000
640+++ qml/Dash/Previews/PreviewCommentInput.qml 2015-10-08 09:06:50 +0000
641@@ -15,7 +15,7 @@
642 */
643
644 import QtQuick 2.0
645-import Ubuntu.Components 1.1
646+import Ubuntu.Components 1.2
647 import "../../Components"
648
649 /*! \brief Preview widget for commenting.
650
651=== modified file 'qml/Dash/Previews/PreviewExpandable.qml'
652--- qml/Dash/Previews/PreviewExpandable.qml 2015-09-15 12:05:09 +0000
653+++ qml/Dash/Previews/PreviewExpandable.qml 2015-10-08 09:06:50 +0000
654@@ -15,7 +15,7 @@
655 */
656
657 import QtQuick 2.3
658-import Ubuntu.Components 1.1
659+import Ubuntu.Components 1.2
660 import "../../Components"
661
662 /*! \brief Preview widget for expandable widgets.
663
664=== modified file 'qml/Dash/Previews/PreviewHeader.qml'
665--- qml/Dash/Previews/PreviewHeader.qml 2015-08-04 13:53:55 +0000
666+++ qml/Dash/Previews/PreviewHeader.qml 2015-10-08 09:06:50 +0000
667@@ -15,7 +15,7 @@
668 */
669
670 import QtQuick 2.0
671-import Ubuntu.Components 0.1
672+import Ubuntu.Components 1.2
673 import Dash 0.1
674 import "../"
675
676
677=== modified file 'qml/Dash/Previews/PreviewIconActions.qml'
678--- qml/Dash/Previews/PreviewIconActions.qml 2015-07-08 10:55:38 +0000
679+++ qml/Dash/Previews/PreviewIconActions.qml 2015-10-08 09:06:50 +0000
680@@ -15,7 +15,7 @@
681 */
682
683 import QtQuick 2.1
684-import Ubuntu.Components 1.1
685+import Ubuntu.Components 1.2
686
687 /*! This preview widget icons+label for number of items in widgetData["actions"].
688 * For each of the items we recognize the fields "label", "icon", "temporaryIcon" and "id".
689
690=== modified file 'qml/Dash/Previews/PreviewImageGallery.qml'
691--- qml/Dash/Previews/PreviewImageGallery.qml 2015-05-06 15:05:06 +0000
692+++ qml/Dash/Previews/PreviewImageGallery.qml 2015-10-08 09:06:50 +0000
693@@ -15,7 +15,7 @@
694 */
695
696 import QtQuick 2.0
697-import Ubuntu.Components 1.1
698+import Ubuntu.Components 1.2
699 import "../../Components"
700
701 /*! This preview widget shows a horizontal list of images.
702
703=== modified file 'qml/Dash/Previews/PreviewOverlay.qml'
704--- qml/Dash/Previews/PreviewOverlay.qml 2015-03-10 12:23:46 +0000
705+++ qml/Dash/Previews/PreviewOverlay.qml 2015-10-08 09:06:50 +0000
706@@ -15,7 +15,7 @@
707 */
708
709 import QtQuick 2.0
710-import Ubuntu.Components 1.1
711+import Ubuntu.Components 1.2
712 import "../../Components"
713
714 Rectangle {
715
716=== modified file 'qml/Dash/Previews/PreviewPayments.qml'
717--- qml/Dash/Previews/PreviewPayments.qml 2014-11-20 11:44:44 +0000
718+++ qml/Dash/Previews/PreviewPayments.qml 2015-10-08 09:06:50 +0000
719@@ -15,7 +15,7 @@
720 */
721
722 import QtQuick 2.1
723-import Ubuntu.Components 0.1
724+import Ubuntu.Components 1.2
725 import Ubuntu.Payments 0.1
726
727 /*! \brief Preview widget for a purchase button.
728
729=== modified file 'qml/Dash/Previews/PreviewProgress.qml'
730--- qml/Dash/Previews/PreviewProgress.qml 2014-04-30 10:51:30 +0000
731+++ qml/Dash/Previews/PreviewProgress.qml 2015-10-08 09:06:50 +0000
732@@ -15,7 +15,7 @@
733 */
734
735 import QtQuick 2.1
736-import Ubuntu.Components 0.1
737+import Ubuntu.Components 1.2
738 import Ubuntu.DownloadDaemonListener 0.1
739
740 /*! \brief Preview widget for a progress bar.
741
742=== modified file 'qml/Dash/Previews/PreviewRatingDisplay.qml'
743--- qml/Dash/Previews/PreviewRatingDisplay.qml 2015-08-04 13:53:55 +0000
744+++ qml/Dash/Previews/PreviewRatingDisplay.qml 2015-10-08 09:06:50 +0000
745@@ -15,7 +15,7 @@
746 */
747
748 import QtQuick 2.0
749-import Ubuntu.Components 0.1
750+import Ubuntu.Components 1.2
751 import "../../Components"
752
753 /*! \brief Preview widget for rating display.
754
755=== modified file 'qml/Dash/Previews/PreviewRatingEdit.qml'
756--- qml/Dash/Previews/PreviewRatingEdit.qml 2015-05-08 13:12:02 +0000
757+++ qml/Dash/Previews/PreviewRatingEdit.qml 2015-10-08 09:06:50 +0000
758@@ -15,7 +15,7 @@
759 */
760
761 import QtQuick 2.4
762-import Ubuntu.Components 0.1
763+import Ubuntu.Components 1.2
764 import "../../Components"
765
766 /*! \brief Preview widget for editable rating.
767
768=== modified file 'qml/Dash/Previews/PreviewRatingInput.qml'
769--- qml/Dash/Previews/PreviewRatingInput.qml 2015-08-31 10:40:59 +0000
770+++ qml/Dash/Previews/PreviewRatingInput.qml 2015-10-08 09:06:50 +0000
771@@ -15,7 +15,7 @@
772 */
773
774 import QtQuick 2.0
775-import Ubuntu.Components 0.1
776+import Ubuntu.Components 1.2
777 import "../../Components"
778
779 /*! \brief Preview widget for rating.
780
781=== modified file 'qml/Dash/Previews/PreviewRatingSingleDisplay.qml'
782--- qml/Dash/Previews/PreviewRatingSingleDisplay.qml 2015-05-08 13:12:02 +0000
783+++ qml/Dash/Previews/PreviewRatingSingleDisplay.qml 2015-10-08 09:06:50 +0000
784@@ -15,7 +15,7 @@
785 */
786
787 import QtQuick 2.4
788-import Ubuntu.Components 0.1
789+import Ubuntu.Components 1.2
790 import "../../Components"
791
792 Column {
793
794=== modified file 'qml/Dash/Previews/PreviewTable.qml'
795--- qml/Dash/Previews/PreviewTable.qml 2015-04-13 10:37:41 +0000
796+++ qml/Dash/Previews/PreviewTable.qml 2015-10-08 09:06:50 +0000
797@@ -16,7 +16,7 @@
798
799 import QtQuick 2.0
800 import QtQuick.Layouts 1.1
801-import Ubuntu.Components 0.1
802+import Ubuntu.Components 1.2
803 import "../../Components"
804
805 /*! \brief Preview widget for table.
806
807=== modified file 'qml/Dash/Previews/PreviewTextSummary.qml'
808--- qml/Dash/Previews/PreviewTextSummary.qml 2014-10-10 10:37:03 +0000
809+++ qml/Dash/Previews/PreviewTextSummary.qml 2015-10-08 09:06:50 +0000
810@@ -15,7 +15,7 @@
811 */
812
813 import QtQuick 2.0
814-import Ubuntu.Components 0.1
815+import Ubuntu.Components 1.2
816 import "../../Components"
817
818 /*! \brief Preview widget for text.
819
820=== modified file 'qml/Dash/Previews/PreviewVideoPlayback.qml'
821--- qml/Dash/Previews/PreviewVideoPlayback.qml 2014-03-31 13:06:36 +0000
822+++ qml/Dash/Previews/PreviewVideoPlayback.qml 2015-10-08 09:06:50 +0000
823@@ -15,7 +15,7 @@
824 */
825
826 import QtQuick 2.0
827-import Ubuntu.Components 0.1
828+import Ubuntu.Components 1.2
829 import Ubuntu.Thumbnailer 0.1
830 import "../../Components"
831
832
833=== modified file 'qml/Dash/Previews/PreviewZoomableImage.qml'
834--- qml/Dash/Previews/PreviewZoomableImage.qml 2015-05-06 15:05:06 +0000
835+++ qml/Dash/Previews/PreviewZoomableImage.qml 2015-10-08 09:06:50 +0000
836@@ -15,7 +15,7 @@
837 */
838
839 import QtQuick 2.0
840-import Ubuntu.Components 0.1
841+import Ubuntu.Components 1.2
842 import "../../Components"
843
844 /*! \brief Preview widget for image.
845
846=== modified file 'qml/Dash/PullToRefreshScopeStyle.qml'
847--- qml/Dash/PullToRefreshScopeStyle.qml 2014-09-30 14:22:22 +0000
848+++ qml/Dash/PullToRefreshScopeStyle.qml 2015-10-08 09:06:50 +0000
849@@ -15,8 +15,8 @@
850 */
851
852 import QtQuick 2.3
853-import Ubuntu.Components 1.1
854-import Ubuntu.Components.Styles 1.1
855+import Ubuntu.Components 1.2
856+import Ubuntu.Components.Styles 1.2
857
858 /**
859 * TODO: Once the SDK version of PullToRefreshStyle doesn't have bug 1375799
860
861=== modified file 'qml/Dash/ScopeSettings/ScopeSetting.qml'
862--- qml/Dash/ScopeSettings/ScopeSetting.qml 2014-08-26 12:27:36 +0000
863+++ qml/Dash/ScopeSettings/ScopeSetting.qml 2015-10-08 09:06:50 +0000
864@@ -15,7 +15,7 @@
865 */
866
867 import QtQuick 2.2
868-import Ubuntu.Components 1.1
869+import Ubuntu.Components 1.2
870
871 /*! Interface for settings widgets. */
872
873
874=== modified file 'qml/Dash/ScopeSettings/ScopeSettingBoolean.qml'
875--- qml/Dash/ScopeSettings/ScopeSettingBoolean.qml 2015-02-10 11:35:11 +0000
876+++ qml/Dash/ScopeSettings/ScopeSettingBoolean.qml 2015-10-08 09:06:50 +0000
877@@ -15,8 +15,8 @@
878 */
879
880 import QtQuick 2.2
881-import Ubuntu.Components 1.1
882-import Ubuntu.Components.ListItems 1.0 as ListItem
883+import Ubuntu.Components 1.2
884+import Ubuntu.Components.ListItems 1.2 as ListItem
885
886 ScopeSetting {
887 id: root
888
889=== modified file 'qml/Dash/ScopeSettings/ScopeSettingList.qml'
890--- qml/Dash/ScopeSettings/ScopeSettingList.qml 2014-08-26 12:33:32 +0000
891+++ qml/Dash/ScopeSettings/ScopeSettingList.qml 2015-10-08 09:06:50 +0000
892@@ -15,8 +15,8 @@
893 */
894
895 import QtQuick 2.2
896-import Ubuntu.Components 1.1
897-import Ubuntu.Components.ListItems 1.0 as ListItem
898+import Ubuntu.Components 1.2
899+import Ubuntu.Components.ListItems 1.2 as ListItem
900
901 ScopeSetting {
902 id: root
903
904=== modified file 'qml/Dash/ScopeSettings/ScopeSettingString.qml'
905--- qml/Dash/ScopeSettings/ScopeSettingString.qml 2014-08-26 12:27:36 +0000
906+++ qml/Dash/ScopeSettings/ScopeSettingString.qml 2015-10-08 09:06:50 +0000
907@@ -15,8 +15,8 @@
908 */
909
910 import QtQuick 2.2
911-import Ubuntu.Components 1.1
912-import Ubuntu.Components.ListItems 1.0 as ListItem
913+import Ubuntu.Components 1.2
914+import Ubuntu.Components.ListItems 1.2 as ListItem
915
916 ScopeSetting {
917 id: root
918
919=== modified file 'qml/Dash/ScopeSettingsPage.qml'
920--- qml/Dash/ScopeSettingsPage.qml 2014-10-23 11:59:22 +0000
921+++ qml/Dash/ScopeSettingsPage.qml 2015-10-08 09:06:50 +0000
922@@ -15,7 +15,7 @@
923 */
924
925 import QtQuick 2.2
926-import Ubuntu.Components 1.1
927+import Ubuntu.Components 1.2
928 import Unity 0.2
929 import "../Components"
930 import "ScopeSettings"
931
932=== modified file 'qml/Dash/ScopesListCategory.qml'
933--- qml/Dash/ScopesListCategory.qml 2015-04-24 07:33:59 +0000
934+++ qml/Dash/ScopesListCategory.qml 2015-10-08 09:06:50 +0000
935@@ -15,7 +15,7 @@
936 */
937
938 import QtQuick 2.3
939-import Ubuntu.Components 1.1
940+import Ubuntu.Components 1.2
941 import Dash 0.1
942 import "../Components/ListItems" as ListItems
943
944
945=== modified file 'qml/Dash/ScopesListCategoryItem.qml'
946--- qml/Dash/ScopesListCategoryItem.qml 2015-02-13 12:03:32 +0000
947+++ qml/Dash/ScopesListCategoryItem.qml 2015-10-08 09:06:50 +0000
948@@ -16,7 +16,7 @@
949
950 import QtQuick 2.3
951 import QtQuick.Layouts 1.1
952-import Ubuntu.Components 1.1
953+import Ubuntu.Components 1.2
954
955 MouseArea {
956 id: root
957
958=== modified file 'qml/Greeter/Clock.qml'
959--- qml/Greeter/Clock.qml 2014-12-11 14:10:18 +0000
960+++ qml/Greeter/Clock.qml 2015-10-08 09:06:50 +0000
961@@ -15,7 +15,7 @@
962 */
963
964 import QtQuick 2.0
965-import Ubuntu.Components 0.1
966+import Ubuntu.Components 1.2
967 import "../Panel/Indicators"
968 import Unity.Indicators 0.1 as Indicators
969
970
971=== modified file 'qml/Greeter/CoverPage.qml'
972--- qml/Greeter/CoverPage.qml 2015-05-11 14:36:03 +0000
973+++ qml/Greeter/CoverPage.qml 2015-10-08 09:06:50 +0000
974@@ -15,7 +15,7 @@
975 */
976
977 import QtQuick 2.3
978-import Ubuntu.Components 1.1
979+import Ubuntu.Components 1.2
980 import Ubuntu.Gestures 0.1
981 import "../Components"
982
983
984=== modified file 'qml/Greeter/Greeter.qml'
985--- qml/Greeter/Greeter.qml 2015-09-02 13:06:56 +0000
986+++ qml/Greeter/Greeter.qml 2015-10-08 09:06:50 +0000
987@@ -17,7 +17,7 @@
988 import QtQuick 2.3
989 import AccountsService 0.1
990 import GSettings 1.0
991-import Ubuntu.Components 1.1
992+import Ubuntu.Components 1.2
993 import Ubuntu.SystemImage 0.1
994 import Unity.Launcher 0.1
995 import "../Components"
996
997=== modified file 'qml/Greeter/Infographics.qml'
998--- qml/Greeter/Infographics.qml 2015-09-16 14:34:56 +0000
999+++ qml/Greeter/Infographics.qml 2015-10-08 09:06:50 +0000
1000@@ -17,7 +17,7 @@
1001 import "../Components"
1002 import "Gradient.js" as Gradient
1003 import QtQuick 2.0
1004-import Ubuntu.Components 0.1
1005+import Ubuntu.Components 1.2
1006
1007 Item {
1008 id: infographic
1009
1010=== modified file 'qml/Greeter/LoginList.qml'
1011--- qml/Greeter/LoginList.qml 2015-02-01 19:53:29 +0000
1012+++ qml/Greeter/LoginList.qml 2015-10-08 09:06:50 +0000
1013@@ -15,7 +15,7 @@
1014 */
1015
1016 import QtQuick 2.3
1017-import Ubuntu.Components 1.1
1018+import Ubuntu.Components 1.2
1019 import "../Components"
1020
1021 Item {
1022
1023=== modified file 'qml/Greeter/NarrowView.qml'
1024--- qml/Greeter/NarrowView.qml 2015-07-17 08:11:51 +0000
1025+++ qml/Greeter/NarrowView.qml 2015-10-08 09:06:50 +0000
1026@@ -15,7 +15,7 @@
1027 */
1028
1029 import QtQuick 2.3
1030-import Ubuntu.Components 1.1
1031+import Ubuntu.Components 1.2
1032 import "../Components"
1033
1034 FocusScope {
1035
1036=== modified file 'qml/Greeter/ObjectPositioner.qml'
1037--- qml/Greeter/ObjectPositioner.qml 2013-06-05 22:03:08 +0000
1038+++ qml/Greeter/ObjectPositioner.qml 2015-10-08 09:06:50 +0000
1039@@ -15,7 +15,7 @@
1040 */
1041
1042 import QtQuick 2.0
1043-import Ubuntu.Components 0.1
1044+import Ubuntu.Components 1.2
1045
1046 Item {
1047 property int count
1048
1049=== modified file 'qml/Greeter/WideView.qml'
1050--- qml/Greeter/WideView.qml 2015-03-04 13:23:34 +0000
1051+++ qml/Greeter/WideView.qml 2015-10-08 09:06:50 +0000
1052@@ -15,7 +15,7 @@
1053 */
1054
1055 import QtQuick 2.3
1056-import Ubuntu.Components 1.1
1057+import Ubuntu.Components 1.2
1058
1059 FocusScope {
1060 id: root
1061
1062=== modified file 'qml/Launcher/FoldingLauncherDelegate.qml'
1063--- qml/Launcher/FoldingLauncherDelegate.qml 2013-08-27 18:30:55 +0000
1064+++ qml/Launcher/FoldingLauncherDelegate.qml 2015-10-08 09:06:50 +0000
1065@@ -15,7 +15,7 @@
1066 */
1067
1068 import QtQuick 2.0
1069-import Ubuntu.Components 0.1
1070+import Ubuntu.Components 1.2
1071
1072 LauncherDelegate {
1073 id: root
1074
1075=== modified file 'qml/Launcher/Launcher.qml'
1076--- qml/Launcher/Launcher.qml 2015-09-02 14:18:40 +0000
1077+++ qml/Launcher/Launcher.qml 2015-10-08 09:06:50 +0000
1078@@ -16,7 +16,7 @@
1079
1080 import QtQuick 2.0
1081 import "../Components"
1082-import Ubuntu.Components 0.1
1083+import Ubuntu.Components 1.2
1084 import Ubuntu.Gestures 0.1
1085 import Unity.Launcher 0.1
1086
1087
1088=== modified file 'qml/Launcher/LauncherDelegate.qml'
1089--- qml/Launcher/LauncherDelegate.qml 2015-07-29 03:31:09 +0000
1090+++ qml/Launcher/LauncherDelegate.qml 2015-10-08 09:06:50 +0000
1091@@ -15,7 +15,7 @@
1092 */
1093
1094 import QtQuick 2.0
1095-import Ubuntu.Components 1.1
1096+import Ubuntu.Components 1.2
1097
1098 Item {
1099 id: root
1100
1101=== modified file 'qml/Launcher/LauncherPanel.qml'
1102--- qml/Launcher/LauncherPanel.qml 2015-08-24 10:18:58 +0000
1103+++ qml/Launcher/LauncherPanel.qml 2015-10-08 09:06:50 +0000
1104@@ -16,9 +16,9 @@
1105
1106 import QtQuick 2.3
1107 import Ubuntu.Components 1.2
1108-import Ubuntu.Components.ListItems 1.0 as ListItems
1109+import Ubuntu.Components.ListItems 1.2 as ListItems
1110 import Unity.Launcher 0.1
1111-import Ubuntu.Components.Popups 0.1
1112+import Ubuntu.Components.Popups 1.2
1113 import "../Components/ListItems"
1114 import "../Components/"
1115
1116
1117=== modified file 'qml/Notifications/Notification.qml'
1118--- qml/Notifications/Notification.qml 2015-09-24 12:51:59 +0000
1119+++ qml/Notifications/Notification.qml 2015-10-08 09:06:50 +0000
1120@@ -21,7 +21,7 @@
1121 import Unity.Notifications 1.0
1122 import QMenuModel 0.1
1123 import Utils 0.1
1124-import Ubuntu.Components.ListItems 0.1 as ListItem
1125+import Ubuntu.Components.ListItems 1.2 as ListItem
1126
1127 Item {
1128 id: notification
1129
1130=== modified file 'qml/Notifications/NotificationMenuItemFactory.qml'
1131--- qml/Notifications/NotificationMenuItemFactory.qml 2014-11-17 13:46:56 +0000
1132+++ qml/Notifications/NotificationMenuItemFactory.qml 2015-10-08 09:06:50 +0000
1133@@ -18,7 +18,7 @@
1134 */
1135
1136 import QtQuick 2.0
1137-import Ubuntu.Components 0.1
1138+import Ubuntu.Components 1.2
1139 import QMenuModel 0.1
1140 import "../Components"
1141
1142
1143=== modified file 'qml/Notifications/Notifications.qml'
1144--- qml/Notifications/Notifications.qml 2015-09-22 14:23:44 +0000
1145+++ qml/Notifications/Notifications.qml 2015-10-08 09:06:50 +0000
1146@@ -15,7 +15,7 @@
1147 */
1148
1149 import QtQuick 2.0
1150-import Ubuntu.Components 0.1
1151+import Ubuntu.Components 1.2
1152 import Unity.Notifications 1.0 as UnityNotifications
1153 import Utils 0.1
1154 import "../Components"
1155
1156=== modified file 'qml/Notifications/OptionToggle.qml'
1157--- qml/Notifications/OptionToggle.qml 2014-11-07 10:55:22 +0000
1158+++ qml/Notifications/OptionToggle.qml 2015-10-08 09:06:50 +0000
1159@@ -15,9 +15,9 @@
1160 */
1161
1162 import QtQuick 2.0
1163-import Ubuntu.Components 0.1
1164-import Ubuntu.Components.ListItems 0.1 as ListItem
1165-import Ubuntu.Components.Popups 0.1
1166+import Ubuntu.Components 1.2
1167+import Ubuntu.Components.ListItems 1.2 as ListItem
1168+import Ubuntu.Components.Popups 1.2
1169
1170 UbuntuShape {
1171 id: optionToggle
1172
1173=== modified file 'qml/Panel/ActiveCallHint.qml'
1174--- qml/Panel/ActiveCallHint.qml 2014-10-08 21:05:50 +0000
1175+++ qml/Panel/ActiveCallHint.qml 2015-10-08 09:06:50 +0000
1176@@ -16,7 +16,7 @@
1177
1178 import QtQuick 2.0
1179 import Ubuntu.Telephony 0.1 as Telephony
1180-import Ubuntu.Components 0.1
1181+import Ubuntu.Components 1.2
1182 import Unity.Application 0.1
1183 import "../Components"
1184
1185
1186=== modified file 'qml/Panel/Handle.qml'
1187--- qml/Panel/Handle.qml 2014-10-09 12:01:57 +0000
1188+++ qml/Panel/Handle.qml 2015-10-08 09:06:50 +0000
1189@@ -15,7 +15,7 @@
1190 */
1191
1192 import QtQuick 2.2
1193-import Ubuntu.Components 1.1
1194+import Ubuntu.Components 1.2
1195
1196 Rectangle {
1197 id: handle
1198
1199=== modified file 'qml/Panel/IndicatorItem.qml'
1200--- qml/Panel/IndicatorItem.qml 2015-09-15 22:50:16 +0000
1201+++ qml/Panel/IndicatorItem.qml 2015-10-08 09:06:50 +0000
1202@@ -15,7 +15,7 @@
1203 */
1204
1205 import QtQuick 2.2
1206-import Ubuntu.Components 1.1
1207+import Ubuntu.Components 1.2
1208 import Ubuntu.Settings.Components 0.1
1209 import "Indicators"
1210
1211
1212=== modified file 'qml/Panel/IndicatorItemRow.qml'
1213--- qml/Panel/IndicatorItemRow.qml 2015-08-04 07:02:08 +0000
1214+++ qml/Panel/IndicatorItemRow.qml 2015-10-08 09:06:50 +0000
1215@@ -15,7 +15,7 @@
1216 */
1217
1218 import QtQuick 2.2
1219-import Ubuntu.Components 1.1
1220+import Ubuntu.Components 1.2
1221
1222 Item {
1223 id: root
1224
1225=== modified file 'qml/Panel/IndicatorPage.qml'
1226--- qml/Panel/IndicatorPage.qml 2015-09-15 22:50:16 +0000
1227+++ qml/Panel/IndicatorPage.qml 2015-10-08 09:06:50 +0000
1228@@ -15,7 +15,7 @@
1229 */
1230
1231 import QtQuick 2.0
1232-import Ubuntu.Components 0.1 as Components
1233+import Ubuntu.Components 1.2 as Components
1234 import Unity.Indicators 0.1 as Indicators
1235 import "Indicators"
1236
1237
1238=== modified file 'qml/Panel/Indicators/MenuItemFactory.qml'
1239--- qml/Panel/Indicators/MenuItemFactory.qml 2015-09-17 18:02:22 +0000
1240+++ qml/Panel/Indicators/MenuItemFactory.qml 2015-10-08 09:06:50 +0000
1241@@ -19,7 +19,7 @@
1242 import Ubuntu.Settings.Components 0.1
1243 import QMenuModel 0.1
1244 import Utils 0.1 as Utils
1245-import Ubuntu.Components.ListItems 0.1 as ListItems
1246+import Ubuntu.Components.ListItems 1.2 as ListItems
1247 import Ubuntu.Components 1.2
1248 import Unity.Session 0.1
1249
1250
1251=== modified file 'qml/Panel/Indicators/MessageMenuItemFactory.qml'
1252--- qml/Panel/Indicators/MessageMenuItemFactory.qml 2015-09-15 22:50:16 +0000
1253+++ qml/Panel/Indicators/MessageMenuItemFactory.qml 2015-10-08 09:06:50 +0000
1254@@ -19,7 +19,7 @@
1255 */
1256
1257 import QtQuick 2.0
1258-import Ubuntu.Components 0.1
1259+import Ubuntu.Components 1.2
1260 import Ubuntu.Settings.Menus 0.1 as Menus
1261 import QMenuModel 0.1 as QMenuModel
1262 import Utils 0.1 as Utils
1263
1264=== modified file 'qml/Panel/Indicators/ModemInfoItem.qml'
1265--- qml/Panel/Indicators/ModemInfoItem.qml 2014-07-31 13:31:32 +0000
1266+++ qml/Panel/Indicators/ModemInfoItem.qml 2015-10-08 09:06:50 +0000
1267@@ -16,8 +16,8 @@
1268
1269 import QtQuick 2.0
1270 import QtQuick.Layouts 1.1
1271-import Ubuntu.Components 0.1
1272-import Ubuntu.Components.ListItems 0.1 as ListItem
1273+import Ubuntu.Components 1.2
1274+import Ubuntu.Components.ListItems 1.2 as ListItem
1275
1276 ListItem.Empty {
1277 id: menu
1278
1279=== modified file 'qml/Panel/Indicators/RoamingIndication.qml'
1280--- qml/Panel/Indicators/RoamingIndication.qml 2014-07-31 13:31:32 +0000
1281+++ qml/Panel/Indicators/RoamingIndication.qml 2015-10-08 09:06:50 +0000
1282@@ -16,7 +16,7 @@
1283
1284 import QtQuick 2.0
1285 import QtQuick.Layouts 1.1
1286-import Ubuntu.Components 0.1
1287+import Ubuntu.Components 1.2
1288
1289 RowLayout {
1290 spacing: units.gu(0.5)
1291
1292=== modified file 'qml/Panel/Indicators/client/IndicatorRepresentation.qml'
1293--- qml/Panel/Indicators/client/IndicatorRepresentation.qml 2015-09-22 10:57:15 +0000
1294+++ qml/Panel/Indicators/client/IndicatorRepresentation.qml 2015-10-08 09:06:50 +0000
1295@@ -19,8 +19,8 @@
1296 */
1297
1298 import QtQuick 2.0
1299-import Ubuntu.Components 0.1
1300-import Ubuntu.Components.ListItems 0.1 as ListItem
1301+import Ubuntu.Components 1.2
1302+import Ubuntu.Components.ListItems 1.2 as ListItem
1303 import "../.."
1304
1305 Page {
1306
1307=== modified file 'qml/Panel/Indicators/client/IndicatorsClient.qml'
1308--- qml/Panel/Indicators/client/IndicatorsClient.qml 2014-07-25 17:52:39 +0000
1309+++ qml/Panel/Indicators/client/IndicatorsClient.qml 2015-10-08 09:06:50 +0000
1310@@ -18,8 +18,8 @@
1311 */
1312
1313 import QtQuick 2.0
1314-import Ubuntu.Components 0.1
1315-import Ubuntu.Components.ListItems 0.1 as ListItem
1316+import Ubuntu.Components 1.2
1317+import Ubuntu.Components.ListItems 1.2 as ListItem
1318
1319 Rectangle {
1320 color: "black"
1321
1322=== modified file 'qml/Panel/Indicators/client/IndicatorsList.qml'
1323--- qml/Panel/Indicators/client/IndicatorsList.qml 2015-03-11 08:07:31 +0000
1324+++ qml/Panel/Indicators/client/IndicatorsList.qml 2015-10-08 09:06:50 +0000
1325@@ -18,8 +18,8 @@
1326 */
1327
1328 import QtQuick 2.0
1329-import Ubuntu.Components 0.1
1330-import Ubuntu.Components.ListItems 0.1 as ListItem
1331+import Ubuntu.Components 1.2
1332+import Ubuntu.Components.ListItems 1.2 as ListItem
1333 import Unity.Indicators 0.1 as Indicators
1334 import "../.."
1335
1336
1337=== modified file 'qml/Panel/Indicators/client/IndicatorsTree.qml'
1338--- qml/Panel/Indicators/client/IndicatorsTree.qml 2014-11-11 15:28:13 +0000
1339+++ qml/Panel/Indicators/client/IndicatorsTree.qml 2015-10-08 09:06:50 +0000
1340@@ -18,7 +18,7 @@
1341 */
1342
1343 import QtQuick 2.0
1344-import Ubuntu.Components 0.1
1345+import Ubuntu.Components 1.2
1346 import Unity.Indicators 0.1 as Indicators
1347 import ".."
1348
1349
1350=== modified file 'qml/Panel/IndicatorsBar.qml'
1351--- qml/Panel/IndicatorsBar.qml 2015-08-20 14:07:45 +0000
1352+++ qml/Panel/IndicatorsBar.qml 2015-10-08 09:06:50 +0000
1353@@ -15,7 +15,7 @@
1354 */
1355
1356 import QtQuick 2.2
1357-import Ubuntu.Components 1.1
1358+import Ubuntu.Components 1.2
1359 import "../Components"
1360
1361 Item {
1362
1363=== modified file 'qml/Panel/IndicatorsMenu.qml'
1364--- qml/Panel/IndicatorsMenu.qml 2015-08-20 14:07:45 +0000
1365+++ qml/Panel/IndicatorsMenu.qml 2015-10-08 09:06:50 +0000
1366@@ -15,7 +15,7 @@
1367 */
1368
1369 import QtQuick 2.2
1370-import Ubuntu.Components 1.1
1371+import Ubuntu.Components 1.2
1372 import Ubuntu.Gestures 0.1
1373 import "../Components"
1374 import "Indicators"
1375
1376=== modified file 'qml/Panel/MenuContent.qml'
1377--- qml/Panel/MenuContent.qml 2014-11-17 23:04:48 +0000
1378+++ qml/Panel/MenuContent.qml 2015-10-08 09:06:50 +0000
1379@@ -16,7 +16,7 @@
1380
1381 import QtQuick 2.2
1382 import QtQuick.Layouts 1.1
1383-import Ubuntu.Components 1.1
1384+import Ubuntu.Components 1.2
1385 import Unity.Indicators 0.1 as Indicators
1386 import Utils 0.1
1387 import "../Components"
1388
1389=== modified file 'qml/Panel/Panel.qml'
1390--- qml/Panel/Panel.qml 2015-06-29 03:58:22 +0000
1391+++ qml/Panel/Panel.qml 2015-10-08 09:06:50 +0000
1392@@ -15,7 +15,7 @@
1393 */
1394
1395 import QtQuick 2.2
1396-import Ubuntu.Components 1.1
1397+import Ubuntu.Components 1.2
1398 import Unity.Application 0.1
1399 import "../Components"
1400 import "../Components/PanelState"
1401
1402=== modified file 'qml/Rotation/RotationStates.qml'
1403--- qml/Rotation/RotationStates.qml 2015-05-11 14:36:03 +0000
1404+++ qml/Rotation/RotationStates.qml 2015-10-08 09:06:50 +0000
1405@@ -15,7 +15,7 @@
1406 */
1407
1408 import QtQuick 2.0
1409-import Ubuntu.Components 1.1
1410+import Ubuntu.Components 1.2
1411 import Powerd 0.1
1412
1413 // Why the state machine is done that way:
1414
1415=== modified file 'qml/ScopeTool.qml'
1416--- qml/ScopeTool.qml 2014-08-07 15:29:12 +0000
1417+++ qml/ScopeTool.qml 2015-10-08 09:06:50 +0000
1418@@ -15,8 +15,8 @@
1419 */
1420
1421 import QtQuick 2.0
1422-import Ubuntu.Components 0.1
1423-import Ubuntu.Components.Popups 0.1
1424+import Ubuntu.Components 1.2
1425+import Ubuntu.Components.Popups 1.2
1426 import Ubuntu.Thumbnailer 0.1 // Register support for image://thumbnailer/ and image://albumart/
1427 import Utils 0.1
1428 import Unity 0.2
1429
1430=== modified file 'qml/Shell.qml'
1431--- qml/Shell.qml 2015-09-22 14:23:44 +0000
1432+++ qml/Shell.qml 2015-10-08 09:06:50 +0000
1433@@ -19,8 +19,8 @@
1434 import AccountsService 0.1
1435 import GSettings 1.0
1436 import Unity.Application 0.1
1437-import Ubuntu.Components 0.1
1438-import Ubuntu.Components.Popups 1.0
1439+import Ubuntu.Components 1.2
1440+import Ubuntu.Components.Popups 1.2
1441 import Ubuntu.Gestures 0.1
1442 import Ubuntu.Telephony 0.1 as Telephony
1443 import Unity.Connectivity 0.1
1444
1445=== modified file 'qml/Stages/Animations/SwipeFromBottomAnimation.qml'
1446--- qml/Stages/Animations/SwipeFromBottomAnimation.qml 2014-09-01 12:46:31 +0000
1447+++ qml/Stages/Animations/SwipeFromBottomAnimation.qml 2015-10-08 09:06:50 +0000
1448@@ -15,7 +15,7 @@
1449 */
1450
1451 import QtQuick 2.0
1452-import Ubuntu.Components 1.1
1453+import Ubuntu.Components 1.2
1454
1455 BaseSessionAnimation {
1456 id: animation
1457
1458=== modified file 'qml/Stages/ApplicationWindow.qml'
1459--- qml/Stages/ApplicationWindow.qml 2015-09-17 12:25:29 +0000
1460+++ qml/Stages/ApplicationWindow.qml 2015-10-08 09:06:50 +0000
1461@@ -15,7 +15,7 @@
1462 */
1463
1464 import QtQuick 2.0
1465-import Ubuntu.Components 1.1
1466+import Ubuntu.Components 1.2
1467 import Unity.Application 0.1
1468
1469 FocusScope {
1470
1471=== modified file 'qml/Stages/DecoratedWindow.qml'
1472--- qml/Stages/DecoratedWindow.qml 2015-09-08 10:32:28 +0000
1473+++ qml/Stages/DecoratedWindow.qml 2015-10-08 09:06:50 +0000
1474@@ -17,7 +17,7 @@
1475 */
1476
1477 import QtQuick 2.3
1478-import Ubuntu.Components 1.1
1479+import Ubuntu.Components 1.2
1480 import Unity.Application 0.1
1481
1482 FocusScope {
1483
1484=== modified file 'qml/Stages/DesktopSpreadDelegate.qml'
1485--- qml/Stages/DesktopSpreadDelegate.qml 2015-09-18 11:03:48 +0000
1486+++ qml/Stages/DesktopSpreadDelegate.qml 2015-10-08 09:06:50 +0000
1487@@ -17,7 +17,7 @@
1488 */
1489
1490 import QtQuick 2.3
1491-import Ubuntu.Components 1.1
1492+import Ubuntu.Components 1.2
1493 import Unity.Application 0.1
1494
1495 Item {
1496
1497=== modified file 'qml/Stages/DesktopStage.qml'
1498--- qml/Stages/DesktopStage.qml 2015-09-18 15:28:07 +0000
1499+++ qml/Stages/DesktopStage.qml 2015-10-08 09:06:50 +0000
1500@@ -18,7 +18,7 @@
1501
1502 import QtQuick 2.4
1503 import QtQuick.Layouts 1.1
1504-import Ubuntu.Components 1.1
1505+import Ubuntu.Components 1.2
1506 import Unity.Application 0.1
1507 import "../Components"
1508 import "../Components/PanelState"
1509
1510=== modified file 'qml/Stages/MainViewStyle.qml'
1511--- qml/Stages/MainViewStyle.qml 2014-09-12 20:16:54 +0000
1512+++ qml/Stages/MainViewStyle.qml 2015-10-08 09:06:50 +0000
1513@@ -14,7 +14,7 @@
1514 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1515 */
1516 import QtQuick 2.0
1517-import Ubuntu.Components 1.1
1518+import Ubuntu.Components 1.2
1519
1520 // FIXME: copied with slight modifications from Ubuntu UI Toolkit's Ambiance's theme
1521 Item {
1522
1523=== modified file 'qml/Stages/PageHeadStyle.qml'
1524--- qml/Stages/PageHeadStyle.qml 2014-08-27 18:50:43 +0000
1525+++ qml/Stages/PageHeadStyle.qml 2015-10-08 09:06:50 +0000
1526@@ -14,8 +14,8 @@
1527 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1528 */
1529 import QtQuick 2.2
1530-import Ubuntu.Components 1.1
1531-import Ubuntu.Components.Styles 1.1 as Style
1532+import Ubuntu.Components 1.2
1533+import Ubuntu.Components.Styles 1.2 as Style
1534
1535 // FIXME: copied with large modifications from Ubuntu UI Toolkit's Ambiance's theme
1536 Style.PageHeadStyle {
1537
1538=== modified file 'qml/Stages/PhoneStage.qml'
1539--- qml/Stages/PhoneStage.qml 2015-09-21 13:37:47 +0000
1540+++ qml/Stages/PhoneStage.qml 2015-10-08 09:06:50 +0000
1541@@ -15,7 +15,7 @@
1542 */
1543
1544 import QtQuick 2.2
1545-import Ubuntu.Components 0.1
1546+import Ubuntu.Components 1.2
1547 import Ubuntu.Gestures 0.1
1548 import Unity.Application 0.1
1549 import Unity.Session 0.1
1550
1551=== modified file 'qml/Stages/ShimStage.qml'
1552--- qml/Stages/ShimStage.qml 2015-04-21 19:43:25 +0000
1553+++ qml/Stages/ShimStage.qml 2015-10-08 09:06:50 +0000
1554@@ -15,7 +15,7 @@
1555 */
1556
1557 import QtQuick 2.3
1558-import Ubuntu.Components 0.1
1559+import Ubuntu.Components 1.2
1560
1561 Rectangle {
1562 id: shimStage
1563
1564=== modified file 'qml/Stages/Splash.qml'
1565--- qml/Stages/Splash.qml 2015-07-10 15:55:50 +0000
1566+++ qml/Stages/Splash.qml 2015-10-08 09:06:50 +0000
1567@@ -15,11 +15,11 @@
1568 */
1569
1570 import QtQuick 2.2
1571-import Ubuntu.Components 1.1
1572+import Ubuntu.Components 1.2
1573 import Ubuntu.Components.Themes 0.1
1574 import "../Components"
1575
1576-import Ubuntu.Components.Themes.Ambiance 1.1 as Ambiance
1577+import Ubuntu.Components.Themes.Ambiance 1.2 as Ambiance
1578
1579 Item {
1580 id: root
1581@@ -65,7 +65,7 @@
1582 property var theme: QtObject {
1583 property string name
1584 property Palette palette: Qt.createQmlObject("import QtQuick 2.2;\
1585- import Ubuntu.Components.Themes.%1 1.1;\
1586+ import Ubuntu.Components.Themes.%1 1.2;\
1587 Palette {}".arg(styledItem.theme.name),
1588 styledItem, "dynamicPalette");
1589 }
1590
1591=== modified file 'qml/Stages/SpreadDelegate.qml'
1592--- qml/Stages/SpreadDelegate.qml 2015-09-21 13:10:02 +0000
1593+++ qml/Stages/SpreadDelegate.qml 2015-10-08 09:06:50 +0000
1594@@ -19,7 +19,7 @@
1595
1596 import QtQuick 2.0
1597 import QtQuick.Window 2.0
1598-import Ubuntu.Components 1.1
1599+import Ubuntu.Components 1.2
1600 import "../Components"
1601
1602 FocusScope {
1603
1604=== modified file 'qml/Stages/SpreadMaths.qml'
1605--- qml/Stages/SpreadMaths.qml 2015-07-14 16:16:42 +0000
1606+++ qml/Stages/SpreadMaths.qml 2015-10-08 09:06:50 +0000
1607@@ -15,7 +15,7 @@
1608 */
1609
1610 import QtQuick 2.2
1611-import Ubuntu.Components 1.1
1612+import Ubuntu.Components 1.2
1613 import Utils 0.1
1614
1615 Item {
1616
1617=== modified file 'qml/Stages/SurfaceContainer.qml'
1618--- qml/Stages/SurfaceContainer.qml 2015-09-09 13:44:12 +0000
1619+++ qml/Stages/SurfaceContainer.qml 2015-10-08 09:06:50 +0000
1620@@ -15,7 +15,7 @@
1621 */
1622
1623 import QtQuick 2.0
1624-import Ubuntu.Components 1.1
1625+import Ubuntu.Components 1.2
1626 import Ubuntu.Gestures 0.1 // For TouchGate
1627 import Utils 0.1 // for InputWatcher
1628 import Unity.Application 0.1 // for MirSurfaceItem
1629
1630=== modified file 'qml/Stages/TabletStage.qml'
1631--- qml/Stages/TabletStage.qml 2015-08-03 13:47:44 +0000
1632+++ qml/Stages/TabletStage.qml 2015-10-08 09:06:50 +0000
1633@@ -15,7 +15,7 @@
1634 */
1635
1636 import QtQuick 2.0
1637-import Ubuntu.Components 0.1
1638+import Ubuntu.Components 1.2
1639 import Ubuntu.Gestures 0.1
1640 import Unity.Application 0.1
1641 import Utils 0.1
1642
1643=== modified file 'qml/Stages/TransformedSpreadDelegate.qml'
1644--- qml/Stages/TransformedSpreadDelegate.qml 2015-04-28 20:20:23 +0000
1645+++ qml/Stages/TransformedSpreadDelegate.qml 2015-10-08 09:06:50 +0000
1646@@ -18,7 +18,7 @@
1647
1648 import QtQuick 2.0
1649 import Utils 0.1
1650-import Ubuntu.Components 0.1
1651+import Ubuntu.Components 1.2
1652
1653 SpreadDelegate {
1654 id: root
1655
1656=== modified file 'qml/Stages/TransformedTabletSpreadDelegate.qml'
1657--- qml/Stages/TransformedTabletSpreadDelegate.qml 2015-03-06 04:44:11 +0000
1658+++ qml/Stages/TransformedTabletSpreadDelegate.qml 2015-10-08 09:06:50 +0000
1659@@ -18,7 +18,7 @@
1660
1661 import QtQuick 2.0
1662 import Utils 0.1
1663-import Ubuntu.Components 0.1
1664+import Ubuntu.Components 1.2
1665 import Unity.Application 0.1
1666
1667 SpreadDelegate {
1668
1669=== modified file 'qml/Stages/WindowDecoration.qml'
1670--- qml/Stages/WindowDecoration.qml 2015-03-13 19:18:35 +0000
1671+++ qml/Stages/WindowDecoration.qml 2015-10-08 09:06:50 +0000
1672@@ -17,7 +17,7 @@
1673 */
1674
1675 import QtQuick 2.3
1676-import Ubuntu.Components 1.1
1677+import Ubuntu.Components 1.2
1678 import "../Components"
1679
1680 Item {
1681
1682=== modified file 'qml/Stages/WindowMoveResizeArea.qml'
1683--- qml/Stages/WindowMoveResizeArea.qml 2015-09-08 10:32:28 +0000
1684+++ qml/Stages/WindowMoveResizeArea.qml 2015-10-08 09:06:50 +0000
1685@@ -17,7 +17,7 @@
1686 */
1687
1688 import QtQuick 2.3
1689-import Ubuntu.Components 1.1
1690+import Ubuntu.Components 1.2
1691 import Utils 0.1
1692
1693 MouseArea {
1694
1695=== modified file 'qml/Tutorial/Arrow.qml'
1696--- qml/Tutorial/Arrow.qml 2014-12-18 23:32:42 +0000
1697+++ qml/Tutorial/Arrow.qml 2015-10-08 09:06:50 +0000
1698@@ -15,7 +15,7 @@
1699 */
1700
1701 import QtQuick 2.3
1702-import Ubuntu.Components 1.1
1703+import Ubuntu.Components 1.2
1704
1705 Item {
1706 id: root
1707
1708=== modified file 'qml/Tutorial/Slider.qml'
1709--- qml/Tutorial/Slider.qml 2015-01-09 21:51:24 +0000
1710+++ qml/Tutorial/Slider.qml 2015-10-08 09:06:50 +0000
1711@@ -15,7 +15,7 @@
1712 */
1713
1714 import QtQuick 2.3
1715-import Ubuntu.Components 1.1
1716+import Ubuntu.Components 1.2
1717
1718 Item {
1719 id: root
1720
1721=== modified file 'qml/Tutorial/Tick.qml'
1722--- qml/Tutorial/Tick.qml 2015-01-06 14:46:52 +0000
1723+++ qml/Tutorial/Tick.qml 2015-10-08 09:06:50 +0000
1724@@ -15,7 +15,7 @@
1725 */
1726
1727 import QtQuick 2.3
1728-import Ubuntu.Components 1.1
1729+import Ubuntu.Components 1.2
1730
1731 MouseArea {
1732 implicitHeight: tick.height
1733
1734=== modified file 'qml/Tutorial/Tutorial.qml'
1735--- qml/Tutorial/Tutorial.qml 2015-08-20 15:05:39 +0000
1736+++ qml/Tutorial/Tutorial.qml 2015-10-08 09:06:50 +0000
1737@@ -15,7 +15,7 @@
1738 */
1739
1740 import QtQuick 2.3
1741-import Ubuntu.Components 1.1
1742+import Ubuntu.Components 1.2
1743
1744 Item {
1745 id: root
1746
1747=== modified file 'qml/Tutorial/TutorialBottom.qml'
1748--- qml/Tutorial/TutorialBottom.qml 2015-04-10 21:16:37 +0000
1749+++ qml/Tutorial/TutorialBottom.qml 2015-10-08 09:06:50 +0000
1750@@ -15,7 +15,7 @@
1751 */
1752
1753 import QtQuick 2.3
1754-import Ubuntu.Components 1.1
1755+import Ubuntu.Components 1.2
1756 import Ubuntu.Gestures 0.1
1757 import "../Components"
1758 import "." as LocalComponents
1759
1760=== modified file 'qml/Tutorial/TutorialBottomFinish.qml'
1761--- qml/Tutorial/TutorialBottomFinish.qml 2015-01-06 14:46:52 +0000
1762+++ qml/Tutorial/TutorialBottomFinish.qml 2015-10-08 09:06:50 +0000
1763@@ -15,7 +15,7 @@
1764 */
1765
1766 import QtQuick 2.3
1767-import Ubuntu.Components 1.1
1768+import Ubuntu.Components 1.2
1769 import "." as LocalComponents
1770
1771 TutorialPage {
1772
1773=== modified file 'qml/Tutorial/TutorialContent.qml'
1774--- qml/Tutorial/TutorialContent.qml 2015-08-20 15:05:39 +0000
1775+++ qml/Tutorial/TutorialContent.qml 2015-10-08 09:06:50 +0000
1776@@ -15,7 +15,7 @@
1777 */
1778
1779 import QtQuick 2.3
1780-import Ubuntu.Components 1.1
1781+import Ubuntu.Components 1.2
1782
1783 Item {
1784 id: root
1785
1786=== modified file 'qml/Tutorial/TutorialLeft.qml'
1787--- qml/Tutorial/TutorialLeft.qml 2015-06-16 22:25:29 +0000
1788+++ qml/Tutorial/TutorialLeft.qml 2015-10-08 09:06:50 +0000
1789@@ -15,7 +15,7 @@
1790 */
1791
1792 import QtQuick 2.3
1793-import Ubuntu.Components 1.1
1794+import Ubuntu.Components 1.2
1795 import "." as LocalComponents
1796
1797 TutorialPage {
1798
1799=== modified file 'qml/Tutorial/TutorialLeftFinish.qml'
1800--- qml/Tutorial/TutorialLeftFinish.qml 2015-01-06 14:46:52 +0000
1801+++ qml/Tutorial/TutorialLeftFinish.qml 2015-10-08 09:06:50 +0000
1802@@ -15,7 +15,7 @@
1803 */
1804
1805 import QtQuick 2.3
1806-import Ubuntu.Components 1.1
1807+import Ubuntu.Components 1.2
1808 import "." as LocalComponents
1809
1810 TutorialPage {
1811
1812=== modified file 'qml/Tutorial/TutorialPage.qml'
1813--- qml/Tutorial/TutorialPage.qml 2015-01-09 21:51:24 +0000
1814+++ qml/Tutorial/TutorialPage.qml 2015-10-08 09:06:50 +0000
1815@@ -15,7 +15,7 @@
1816 */
1817
1818 import QtQuick 2.3
1819-import Ubuntu.Components 1.1
1820+import Ubuntu.Components 1.2
1821 import "../Components"
1822
1823 Showable {
1824
1825=== modified file 'qml/Tutorial/TutorialRight.qml'
1826--- qml/Tutorial/TutorialRight.qml 2015-02-18 21:31:54 +0000
1827+++ qml/Tutorial/TutorialRight.qml 2015-10-08 09:06:50 +0000
1828@@ -15,7 +15,7 @@
1829 */
1830
1831 import QtQuick 2.3
1832-import Ubuntu.Components 1.1
1833+import Ubuntu.Components 1.2
1834 import Ubuntu.Gestures 0.1
1835 import Unity.Application 0.1
1836 import "../Components"
1837
1838=== modified file 'qml/Wizard/CheckableSetting.qml'
1839--- qml/Wizard/CheckableSetting.qml 2014-11-14 17:47:00 +0000
1840+++ qml/Wizard/CheckableSetting.qml 2015-10-08 09:06:50 +0000
1841@@ -15,8 +15,8 @@
1842 */
1843
1844 import QtQuick 2.3
1845-import Ubuntu.Components 1.1
1846-import Ubuntu.Components.ListItems 1.0 as ListItem
1847+import Ubuntu.Components 1.2
1848+import Ubuntu.Components.ListItems 1.2 as ListItem
1849
1850 ListItem.Empty {
1851 id: listItem
1852
1853=== modified file 'qml/Wizard/Page.qml'
1854--- qml/Wizard/Page.qml 2015-03-13 10:07:57 +0000
1855+++ qml/Wizard/Page.qml 2015-10-08 09:06:50 +0000
1856@@ -15,7 +15,7 @@
1857 */
1858
1859 import QtQuick 2.3
1860-import Ubuntu.Components 1.1
1861+import Ubuntu.Components 1.2
1862
1863 Item {
1864 readonly property real buttonMargin: units.gu(2)
1865
1866=== modified file 'qml/Wizard/Pages.qml'
1867--- qml/Wizard/Pages.qml 2015-03-03 14:42:10 +0000
1868+++ qml/Wizard/Pages.qml 2015-10-08 09:06:50 +0000
1869@@ -15,7 +15,7 @@
1870 */
1871
1872 import QtQuick 2.3
1873-import Ubuntu.Components 1.1
1874+import Ubuntu.Components 1.2
1875 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
1876 import Wizard 0.1
1877 import "../Components"
1878
1879=== modified file 'qml/Wizard/Pages/10-welcome.qml'
1880--- qml/Wizard/Pages/10-welcome.qml 2014-11-21 19:28:16 +0000
1881+++ qml/Wizard/Pages/10-welcome.qml 2015-10-08 09:06:50 +0000
1882@@ -15,8 +15,8 @@
1883 */
1884
1885 import QtQuick 2.3
1886-import Ubuntu.Components 1.1
1887-import Ubuntu.Components.ListItems 0.1
1888+import Ubuntu.Components 1.2
1889+import Ubuntu.Components.ListItems 1.2
1890 import Ubuntu.SystemSettings.LanguagePlugin 1.0
1891 import Wizard 0.1
1892 import ".." as LocalComponents
1893
1894=== modified file 'qml/Wizard/Pages/20-sim.qml'
1895--- qml/Wizard/Pages/20-sim.qml 2015-05-19 18:56:17 +0000
1896+++ qml/Wizard/Pages/20-sim.qml 2015-10-08 09:06:50 +0000
1897@@ -16,7 +16,7 @@
1898
1899 import QtQuick 2.0
1900 import MeeGo.QOfono 0.2
1901-import Ubuntu.Components 0.1
1902+import Ubuntu.Components 1.2
1903 import ".." as LocalComponents
1904
1905 LocalComponents.Page {
1906
1907=== modified file 'qml/Wizard/Pages/30-passwd-type.qml'
1908--- qml/Wizard/Pages/30-passwd-type.qml 2015-03-13 10:07:57 +0000
1909+++ qml/Wizard/Pages/30-passwd-type.qml 2015-10-08 09:06:50 +0000
1910@@ -15,8 +15,8 @@
1911 */
1912
1913 import QtQuick 2.3
1914-import Ubuntu.Components 1.1
1915-import Ubuntu.Components.ListItems 1.0
1916+import Ubuntu.Components 1.2
1917+import Ubuntu.Components.ListItems 1.2
1918 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
1919 import ".." as LocalComponents
1920
1921
1922=== modified file 'qml/Wizard/Pages/40-wifi.qml'
1923--- qml/Wizard/Pages/40-wifi.qml 2015-02-03 15:00:26 +0000
1924+++ qml/Wizard/Pages/40-wifi.qml 2015-10-08 09:06:50 +0000
1925@@ -17,8 +17,8 @@
1926 import QtQuick 2.0
1927 import QMenuModel 0.1 as QMenuModel
1928 import QtSystemInfo 5.0
1929-import Ubuntu.Components 0.1
1930-import Ubuntu.Components.ListItems 0.1 as ListItem
1931+import Ubuntu.Components 1.2
1932+import Ubuntu.Components.ListItems 1.2 as ListItem
1933 import Ubuntu.Settings.Menus 0.1 as Menus
1934 import ".." as LocalComponents
1935
1936
1937=== modified file 'qml/Wizard/Pages/50-location.qml'
1938--- qml/Wizard/Pages/50-location.qml 2015-07-21 09:08:49 +0000
1939+++ qml/Wizard/Pages/50-location.qml 2015-10-08 09:06:50 +0000
1940@@ -18,7 +18,7 @@
1941 import AccountsService 0.1
1942 import QMenuModel 0.1 as QMenuModel
1943 import Qt.labs.folderlistmodel 2.1
1944-import Ubuntu.Components 1.1
1945+import Ubuntu.Components 1.2
1946 import ".." as LocalComponents
1947
1948 LocalComponents.Page {
1949
1950=== modified file 'qml/Wizard/Pages/60-reporting.qml'
1951--- qml/Wizard/Pages/60-reporting.qml 2015-09-30 18:36:56 +0000
1952+++ qml/Wizard/Pages/60-reporting.qml 2015-10-08 09:06:50 +0000
1953@@ -15,7 +15,7 @@
1954 */
1955
1956 import QtQuick 2.0
1957-import Ubuntu.Components 0.1
1958+import Ubuntu.Components 1.2
1959 import Ubuntu.SystemSettings.Diagnostics 1.0
1960 import ".." as LocalComponents
1961
1962
1963=== modified file 'qml/Wizard/Pages/80-finished.qml'
1964--- qml/Wizard/Pages/80-finished.qml 2014-11-21 19:28:16 +0000
1965+++ qml/Wizard/Pages/80-finished.qml 2015-10-08 09:06:50 +0000
1966@@ -15,7 +15,7 @@
1967 */
1968
1969 import QtQuick 2.0
1970-import Ubuntu.Components 0.1
1971+import Ubuntu.Components 1.2
1972 import ".." as LocalComponents
1973
1974 LocalComponents.Page {
1975
1976=== modified file 'qml/Wizard/Pages/here-terms.qml'
1977--- qml/Wizard/Pages/here-terms.qml 2014-11-21 19:28:16 +0000
1978+++ qml/Wizard/Pages/here-terms.qml 2015-10-08 09:06:50 +0000
1979@@ -17,7 +17,7 @@
1980 import QtQuick 2.3
1981 import AccountsService 0.1
1982 import Qt.labs.folderlistmodel 2.1
1983-import Ubuntu.Components 1.1
1984+import Ubuntu.Components 1.2
1985 import Ubuntu.Web 0.2
1986 import ".." as LocalComponents
1987
1988
1989=== modified file 'qml/Wizard/Pages/passwd-confirm.qml'
1990--- qml/Wizard/Pages/passwd-confirm.qml 2014-11-21 19:28:16 +0000
1991+++ qml/Wizard/Pages/passwd-confirm.qml 2015-10-08 09:06:50 +0000
1992@@ -15,7 +15,7 @@
1993 */
1994
1995 import QtQuick 2.3
1996-import Ubuntu.Components 1.1
1997+import Ubuntu.Components 1.2
1998 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
1999 import ".." as LocalComponents
2000 import "../../Components" as UnityComponents
2001
2002=== modified file 'qml/Wizard/Pages/passwd-set.qml'
2003--- qml/Wizard/Pages/passwd-set.qml 2014-11-21 19:28:16 +0000
2004+++ qml/Wizard/Pages/passwd-set.qml 2015-10-08 09:06:50 +0000
2005@@ -15,7 +15,7 @@
2006 */
2007
2008 import QtQuick 2.3
2009-import Ubuntu.Components 1.1
2010+import Ubuntu.Components 1.2
2011 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
2012 import ".." as LocalComponents
2013 import "../../Components" as UnityComponents
2014
2015=== modified file 'qml/Wizard/StackButton.qml'
2016--- qml/Wizard/StackButton.qml 2014-11-14 17:47:00 +0000
2017+++ qml/Wizard/StackButton.qml 2015-10-08 09:06:50 +0000
2018@@ -15,7 +15,7 @@
2019 */
2020
2021 import QtQuick 2.3
2022-import Ubuntu.Components 1.1
2023+import Ubuntu.Components 1.2
2024
2025 AbstractButton {
2026 id: stackButton
2027
2028=== modified file 'qml/Wizard/Wizard.qml'
2029--- qml/Wizard/Wizard.qml 2015-03-11 14:48:45 +0000
2030+++ qml/Wizard/Wizard.qml 2015-10-08 09:06:50 +0000
2031@@ -15,7 +15,7 @@
2032 */
2033
2034 import QtQuick 2.3
2035-import Ubuntu.Components 1.1
2036+import Ubuntu.Components 1.2
2037 import Wizard 0.1
2038 import "../Components"
2039
2040
2041=== modified file 'tests/CMakeLists.txt'
2042--- tests/CMakeLists.txt 2015-09-21 09:42:30 +0000
2043+++ tests/CMakeLists.txt 2015-10-08 09:06:50 +0000
2044@@ -132,3 +132,4 @@
2045 add_subdirectory(plugins)
2046 add_subdirectory(qmltests)
2047 add_subdirectory(whitespace)
2048+add_subdirectory(sdk)
2049
2050=== modified file 'tests/autopilot/unity8/dash.py'
2051--- tests/autopilot/unity8/dash.py 2015-09-03 07:44:51 +0000
2052+++ tests/autopilot/unity8/dash.py 2015-10-08 09:06:50 +0000
2053@@ -36,7 +36,7 @@
2054 def __init__(self, app_proxy):
2055 self.app_proxy = app_proxy
2056 self.main_view = self.app_proxy.select_single(
2057- ubuntuuitoolkit.MainView)
2058+ 'MainView12')
2059 self.dash = self.main_view.select_single(Dash)
2060
2061
2062
2063=== modified file 'tests/plugins/Dash/tst_CroppedImageMinimumSourceSize.qml'
2064--- tests/plugins/Dash/tst_CroppedImageMinimumSourceSize.qml 2015-08-31 13:29:42 +0000
2065+++ tests/plugins/Dash/tst_CroppedImageMinimumSourceSize.qml 2015-10-08 09:06:50 +0000
2066@@ -16,7 +16,7 @@
2067
2068 import QtQuick 2.3
2069 import QtTest 1.0
2070-import Ubuntu.Components 1.1
2071+import Ubuntu.Components 1.2
2072 import Dash 0.1
2073
2074 Rectangle {
2075
2076=== modified file 'tests/plugins/Dash/tst_ScopeStyle.qml'
2077--- tests/plugins/Dash/tst_ScopeStyle.qml 2014-11-20 11:44:44 +0000
2078+++ tests/plugins/Dash/tst_ScopeStyle.qml 2015-10-08 09:06:50 +0000
2079@@ -17,7 +17,7 @@
2080 import QtQuick 2.2
2081 import QtTest 1.0
2082 import Dash 0.1
2083-import Ubuntu.Components 1.1
2084+import Ubuntu.Components 1.2
2085 import Utils 0.1
2086
2087 Rectangle {
2088
2089=== modified file 'tests/plugins/Ubuntu/Gestures/DownwardsLauncher.qml'
2090--- tests/plugins/Ubuntu/Gestures/DownwardsLauncher.qml 2015-04-10 21:16:37 +0000
2091+++ tests/plugins/Ubuntu/Gestures/DownwardsLauncher.qml 2015-10-08 09:06:50 +0000
2092@@ -16,7 +16,7 @@
2093
2094 import QtQuick 2.0
2095 import Ubuntu.Gestures 0.1
2096-import Ubuntu.Components 0.1
2097+import Ubuntu.Components 1.2
2098
2099 Item {
2100
2101
2102=== modified file 'tests/plugins/Ubuntu/Gestures/LeftwardsLauncher.qml'
2103--- tests/plugins/Ubuntu/Gestures/LeftwardsLauncher.qml 2015-04-10 21:16:37 +0000
2104+++ tests/plugins/Ubuntu/Gestures/LeftwardsLauncher.qml 2015-10-08 09:06:50 +0000
2105@@ -16,7 +16,7 @@
2106
2107 import QtQuick 2.0
2108 import Ubuntu.Gestures 0.1
2109-import Ubuntu.Components 0.1
2110+import Ubuntu.Components 1.2
2111
2112 Item {
2113 id: root
2114
2115=== modified file 'tests/plugins/Ubuntu/Gestures/RightwardsLauncher.qml'
2116--- tests/plugins/Ubuntu/Gestures/RightwardsLauncher.qml 2015-04-10 21:16:37 +0000
2117+++ tests/plugins/Ubuntu/Gestures/RightwardsLauncher.qml 2015-10-08 09:06:50 +0000
2118@@ -16,7 +16,7 @@
2119
2120 import QtQuick 2.0
2121 import Ubuntu.Gestures 0.1
2122-import Ubuntu.Components 0.1
2123+import Ubuntu.Components 1.2
2124
2125 Item {
2126 objectName: "rightwardsLauncher"
2127
2128=== modified file 'tests/plugins/Ubuntu/Gestures/UpwardsLauncher.qml'
2129--- tests/plugins/Ubuntu/Gestures/UpwardsLauncher.qml 2015-04-10 21:16:37 +0000
2130+++ tests/plugins/Ubuntu/Gestures/UpwardsLauncher.qml 2015-10-08 09:06:50 +0000
2131@@ -16,7 +16,7 @@
2132
2133 import QtQuick 2.0
2134 import Ubuntu.Gestures 0.1
2135-import Ubuntu.Components 0.1
2136+import Ubuntu.Components 1.2
2137
2138 Item {
2139 id: root
2140
2141=== modified file 'tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.qml'
2142--- tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.qml 2015-04-10 21:16:37 +0000
2143+++ tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.qml 2015-10-08 09:06:50 +0000
2144@@ -15,7 +15,7 @@
2145 */
2146
2147 import QtQuick 2.0
2148-import Ubuntu.Components 0.1
2149+import Ubuntu.Components 1.2
2150 import Unity.Test 0.1
2151
2152 Rectangle {
2153
2154=== modified file 'tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.qml'
2155--- tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.qml 2015-05-27 09:37:34 +0000
2156+++ tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.qml 2015-10-08 09:06:50 +0000
2157@@ -15,7 +15,7 @@
2158 */
2159
2160 import QtQuick 2.0
2161-import Ubuntu.Components 0.1
2162+import Ubuntu.Components 1.2
2163 import Ubuntu.Gestures 0.1
2164 import Unity.Test 0.1
2165
2166
2167=== modified file 'tests/plugins/Ubuntu/Gestures/tst_PressedOutsideNotifier.qml'
2168--- tests/plugins/Ubuntu/Gestures/tst_PressedOutsideNotifier.qml 2013-11-22 13:43:40 +0000
2169+++ tests/plugins/Ubuntu/Gestures/tst_PressedOutsideNotifier.qml 2015-10-08 09:06:50 +0000
2170@@ -15,7 +15,7 @@
2171 */
2172
2173 import QtQuick 2.0
2174-import Ubuntu.Components 0.1
2175+import Ubuntu.Components 1.2
2176 import Ubuntu.Gestures 0.1
2177
2178 /*
2179
2180=== modified file 'tests/qmltests/Components/tst_Dialogs.qml'
2181--- tests/qmltests/Components/tst_Dialogs.qml 2015-08-24 15:39:53 +0000
2182+++ tests/qmltests/Components/tst_Dialogs.qml 2015-10-08 09:06:50 +0000
2183@@ -16,7 +16,7 @@
2184
2185 import QtQuick 2.2
2186 import QtTest 1.0
2187-import Ubuntu.Components 1.1
2188+import Ubuntu.Components 1.2
2189 import Unity.Test 0.1
2190
2191 import "../../../qml/Components"
2192
2193=== modified file 'tests/qmltests/Components/tst_DragHandle.qml'
2194--- tests/qmltests/Components/tst_DragHandle.qml 2015-04-10 21:16:37 +0000
2195+++ tests/qmltests/Components/tst_DragHandle.qml 2015-10-08 09:06:50 +0000
2196@@ -17,7 +17,7 @@
2197 import QtQuick 2.0
2198 import "../../../qml/Components"
2199 import "tst_DragHandle"
2200-import Ubuntu.Components 0.1
2201+import Ubuntu.Components 1.2
2202 import Ubuntu.Gestures 0.1
2203 import Unity.Test 0.1
2204
2205
2206=== modified file 'tests/qmltests/Components/tst_DragHandle/BidirectionalShowable.qml'
2207--- tests/qmltests/Components/tst_DragHandle/BidirectionalShowable.qml 2015-04-10 21:16:37 +0000
2208+++ tests/qmltests/Components/tst_DragHandle/BidirectionalShowable.qml 2015-10-08 09:06:50 +0000
2209@@ -16,7 +16,7 @@
2210
2211 import QtQuick 2.0
2212 import "../../../../qml/Components"
2213-import Ubuntu.Components 0.1
2214+import Ubuntu.Components 1.2
2215 import Ubuntu.Gestures 0.1
2216
2217 Item {
2218
2219=== modified file 'tests/qmltests/Components/tst_DragHandle/HorizontalShowable.qml'
2220--- tests/qmltests/Components/tst_DragHandle/HorizontalShowable.qml 2015-04-10 21:16:37 +0000
2221+++ tests/qmltests/Components/tst_DragHandle/HorizontalShowable.qml 2015-10-08 09:06:50 +0000
2222@@ -16,7 +16,7 @@
2223
2224 import QtQuick 2.0
2225 import "../../../../qml/Components"
2226-import Ubuntu.Components 0.1
2227+import Ubuntu.Components 1.2
2228 import Ubuntu.Gestures 0.1
2229
2230 Showable {
2231
2232=== modified file 'tests/qmltests/Components/tst_DragHandle/VerticalShowable.qml'
2233--- tests/qmltests/Components/tst_DragHandle/VerticalShowable.qml 2015-04-10 21:16:37 +0000
2234+++ tests/qmltests/Components/tst_DragHandle/VerticalShowable.qml 2015-10-08 09:06:50 +0000
2235@@ -16,7 +16,7 @@
2236
2237 import QtQuick 2.0
2238 import "../../../../qml/Components"
2239-import Ubuntu.Components 0.1
2240+import Ubuntu.Components 1.2
2241 import Ubuntu.Gestures 0.1
2242
2243 Showable {
2244
2245=== modified file 'tests/qmltests/Components/tst_LazyImage.qml'
2246--- tests/qmltests/Components/tst_LazyImage.qml 2014-08-13 10:29:21 +0000
2247+++ tests/qmltests/Components/tst_LazyImage.qml 2015-10-08 09:06:50 +0000
2248@@ -17,7 +17,7 @@
2249 import QtQuick 2.0
2250 import QtTest 1.0
2251 import "../../../qml/Components"
2252-import Ubuntu.Components 0.1
2253+import Ubuntu.Components 1.2
2254 import Unity.Test 0.1 as UT
2255 import "tst_LazyImage"
2256
2257
2258=== modified file 'tests/qmltests/Components/tst_LazyImage/ImageControls.qml'
2259--- tests/qmltests/Components/tst_LazyImage/ImageControls.qml 2013-12-17 16:04:47 +0000
2260+++ tests/qmltests/Components/tst_LazyImage/ImageControls.qml 2015-10-08 09:06:50 +0000
2261@@ -15,7 +15,7 @@
2262 */
2263
2264 import QtQuick 2.0
2265-import Ubuntu.Components 0.1
2266+import Ubuntu.Components 1.2
2267 import "../../../../qml/Components"
2268
2269 Row {
2270
2271=== modified file 'tests/qmltests/Components/tst_Lockscreen.qml'
2272--- tests/qmltests/Components/tst_Lockscreen.qml 2015-03-18 12:32:08 +0000
2273+++ tests/qmltests/Components/tst_Lockscreen.qml 2015-10-08 09:06:50 +0000
2274@@ -18,7 +18,7 @@
2275 import QtTest 1.0
2276 import ".."
2277 import "../../../qml/Components"
2278-import Ubuntu.Components 0.1
2279+import Ubuntu.Components 1.2
2280 import Unity.Test 0.1 as UT
2281
2282 Rectangle {
2283
2284=== modified file 'tests/qmltests/Components/tst_Rating.qml'
2285--- tests/qmltests/Components/tst_Rating.qml 2014-02-13 17:00:06 +0000
2286+++ tests/qmltests/Components/tst_Rating.qml 2015-10-08 09:06:50 +0000
2287@@ -17,7 +17,7 @@
2288 import QtQuick 2.0
2289 import QtTest 1.0
2290 import "../../../qml/Components"
2291-import Ubuntu.Components 0.1
2292+import Ubuntu.Components 1.2
2293 import Unity.Test 0.1 as UT
2294
2295 Rectangle {
2296
2297=== modified file 'tests/qmltests/Components/tst_ResponsiveGridView.qml'
2298--- tests/qmltests/Components/tst_ResponsiveGridView.qml 2014-01-27 18:03:45 +0000
2299+++ tests/qmltests/Components/tst_ResponsiveGridView.qml 2015-10-08 09:06:50 +0000
2300@@ -18,8 +18,8 @@
2301 import QtTest 1.0
2302 import ".."
2303 import "../../../qml/Components"
2304-import Ubuntu.Components.ListItems 0.1 as ListItem
2305-import Ubuntu.Components 0.1
2306+import Ubuntu.Components.ListItems 1.2 as ListItem
2307+import Ubuntu.Components 1.2
2308 import Unity.Test 0.1 as UT
2309
2310 Item {
2311
2312=== modified file 'tests/qmltests/Components/tst_ResponsiveVerticalJournal.qml'
2313--- tests/qmltests/Components/tst_ResponsiveVerticalJournal.qml 2014-12-19 14:51:35 +0000
2314+++ tests/qmltests/Components/tst_ResponsiveVerticalJournal.qml 2015-10-08 09:06:50 +0000
2315@@ -18,8 +18,8 @@
2316 import QtTest 1.0
2317 import ".."
2318 import "../../../qml/Components"
2319-import Ubuntu.Components.ListItems 0.1 as ListItem
2320-import Ubuntu.Components 0.1
2321+import Ubuntu.Components.ListItems 1.2 as ListItem
2322+import Ubuntu.Components 1.2
2323 import Utils 0.1
2324 import Unity.Test 0.1 as UT
2325
2326
2327=== modified file 'tests/qmltests/Components/tst_Showable.qml'
2328--- tests/qmltests/Components/tst_Showable.qml 2015-04-10 15:10:51 +0000
2329+++ tests/qmltests/Components/tst_Showable.qml 2015-10-08 09:06:50 +0000
2330@@ -16,7 +16,7 @@
2331
2332 import QtQuick 2.0
2333 import QtTest 1.0
2334-import Ubuntu.Components 0.1
2335+import Ubuntu.Components 1.2
2336 import Unity.Test 0.1 as UT
2337 import ".."
2338 import "../../../qml/Components"
2339
2340=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewActions.qml'
2341--- tests/qmltests/Dash/Previews/tst_PreviewActions.qml 2015-01-09 09:15:45 +0000
2342+++ tests/qmltests/Dash/Previews/tst_PreviewActions.qml 2015-10-08 09:06:50 +0000
2343@@ -18,7 +18,7 @@
2344 import QtTest 1.0
2345 import "../../../../qml/Dash/Previews"
2346 import Unity.Test 0.1 as UT
2347-import Ubuntu.Components 0.1
2348+import Ubuntu.Components 1.2
2349
2350
2351 Rectangle {
2352
2353=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewAudioPlayback.qml'
2354--- tests/qmltests/Dash/Previews/tst_PreviewAudioPlayback.qml 2015-01-09 09:15:45 +0000
2355+++ tests/qmltests/Dash/Previews/tst_PreviewAudioPlayback.qml 2015-10-08 09:06:50 +0000
2356@@ -16,7 +16,7 @@
2357
2358 import QtQuick 2.0
2359 import QtTest 1.0
2360-import Ubuntu.Components 0.1
2361+import Ubuntu.Components 1.2
2362 import "../../../../qml/Dash/Previews"
2363 import Unity.Test 0.1 as UT
2364 import QtMultimedia 5.0
2365
2366=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewComment.qml'
2367--- tests/qmltests/Dash/Previews/tst_PreviewComment.qml 2015-07-01 15:48:29 +0000
2368+++ tests/qmltests/Dash/Previews/tst_PreviewComment.qml 2015-10-08 09:06:50 +0000
2369@@ -16,7 +16,7 @@
2370
2371 import QtQuick 2.0
2372 import QtTest 1.0
2373-import Ubuntu.Components 1.1
2374+import Ubuntu.Components 1.2
2375 import "../../../../qml/Dash/Previews"
2376 import Unity.Test 0.1 as UT
2377
2378
2379=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewCommentInput.qml'
2380--- tests/qmltests/Dash/Previews/tst_PreviewCommentInput.qml 2015-07-06 11:15:25 +0000
2381+++ tests/qmltests/Dash/Previews/tst_PreviewCommentInput.qml 2015-10-08 09:06:50 +0000
2382@@ -16,7 +16,7 @@
2383
2384 import QtQuick 2.0
2385 import QtTest 1.0
2386-import Ubuntu.Components 1.1
2387+import Ubuntu.Components 1.2
2388 import "../../../../qml/Dash/Previews"
2389 import Unity.Test 0.1 as UT
2390
2391
2392=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml'
2393--- tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml 2015-09-08 05:15:59 +0000
2394+++ tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml 2015-10-08 09:06:50 +0000
2395@@ -16,7 +16,7 @@
2396
2397 import QtQuick 2.0
2398 import QtTest 1.0
2399-import Ubuntu.Components 0.1
2400+import Ubuntu.Components 1.2
2401 import "../../../../qml/Dash/Previews"
2402 import Unity.Test 0.1 as UT
2403
2404
2405=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewIconActions.qml'
2406--- tests/qmltests/Dash/Previews/tst_PreviewIconActions.qml 2015-07-08 12:52:51 +0000
2407+++ tests/qmltests/Dash/Previews/tst_PreviewIconActions.qml 2015-10-08 09:06:50 +0000
2408@@ -18,7 +18,7 @@
2409 import QtTest 1.0
2410 import "../../../../qml/Dash/Previews"
2411 import Unity.Test 0.1 as UT
2412-import Ubuntu.Components 0.1
2413+import Ubuntu.Components 1.2
2414
2415
2416 Rectangle {
2417
2418=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewPayments.qml'
2419--- tests/qmltests/Dash/Previews/tst_PreviewPayments.qml 2015-01-09 09:40:52 +0000
2420+++ tests/qmltests/Dash/Previews/tst_PreviewPayments.qml 2015-10-08 09:06:50 +0000
2421@@ -18,7 +18,7 @@
2422 import QtTest 1.0
2423 import "../../../../qml/Dash/Previews"
2424 import Unity.Test 0.1 as UT
2425-import Ubuntu.Components 0.1
2426+import Ubuntu.Components 1.2
2427
2428 Rectangle {
2429 id: root
2430
2431=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewProgress.qml'
2432--- tests/qmltests/Dash/Previews/tst_PreviewProgress.qml 2014-02-12 16:28:08 +0000
2433+++ tests/qmltests/Dash/Previews/tst_PreviewProgress.qml 2015-10-08 09:06:50 +0000
2434@@ -18,7 +18,7 @@
2435 import QtTest 1.0
2436 import "../../../../qml/Dash/Previews"
2437 import Unity.Test 0.1 as UT
2438-import Ubuntu.Components 0.1
2439+import Ubuntu.Components 1.2
2440
2441 Rectangle {
2442 id: root
2443
2444=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewRatingDisplay.qml'
2445--- tests/qmltests/Dash/Previews/tst_PreviewRatingDisplay.qml 2015-01-09 09:15:45 +0000
2446+++ tests/qmltests/Dash/Previews/tst_PreviewRatingDisplay.qml 2015-10-08 09:06:50 +0000
2447@@ -16,7 +16,7 @@
2448
2449 import QtQuick 2.0
2450 import QtTest 1.0
2451-import Ubuntu.Components 0.1
2452+import Ubuntu.Components 1.2
2453 import "../../../../qml/Dash/Previews"
2454 import Unity.Test 0.1 as UT
2455
2456
2457=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewRatingEdit.qml'
2458--- tests/qmltests/Dash/Previews/tst_PreviewRatingEdit.qml 2015-05-08 13:12:02 +0000
2459+++ tests/qmltests/Dash/Previews/tst_PreviewRatingEdit.qml 2015-10-08 09:06:50 +0000
2460@@ -16,7 +16,7 @@
2461
2462 import QtQuick 2.0
2463 import QtTest 1.0
2464-import Ubuntu.Components 0.1
2465+import Ubuntu.Components 1.2
2466 import "../../../../qml/Dash/Previews"
2467 import Unity.Test 0.1 as UT
2468
2469
2470=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewRatingInput.qml'
2471--- tests/qmltests/Dash/Previews/tst_PreviewRatingInput.qml 2015-02-17 15:06:33 +0000
2472+++ tests/qmltests/Dash/Previews/tst_PreviewRatingInput.qml 2015-10-08 09:06:50 +0000
2473@@ -16,7 +16,7 @@
2474
2475 import QtQuick 2.0
2476 import QtTest 1.0
2477-import Ubuntu.Components 0.1
2478+import Ubuntu.Components 1.2
2479 import "../../../../qml/Dash/Previews"
2480 import Unity.Test 0.1 as UT
2481
2482
2483=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewTable.qml'
2484--- tests/qmltests/Dash/Previews/tst_PreviewTable.qml 2015-04-13 11:08:53 +0000
2485+++ tests/qmltests/Dash/Previews/tst_PreviewTable.qml 2015-10-08 09:06:50 +0000
2486@@ -16,7 +16,7 @@
2487
2488 import QtQuick 2.0
2489 import QtTest 1.0
2490-import Ubuntu.Components 0.1
2491+import Ubuntu.Components 1.2
2492 import "../../../../qml/Dash/Previews"
2493 import Unity.Test 0.1 as UT
2494
2495
2496=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewTextSummary.qml'
2497--- tests/qmltests/Dash/Previews/tst_PreviewTextSummary.qml 2014-08-01 09:55:04 +0000
2498+++ tests/qmltests/Dash/Previews/tst_PreviewTextSummary.qml 2015-10-08 09:06:50 +0000
2499@@ -16,7 +16,7 @@
2500
2501 import QtQuick 2.0
2502 import QtTest 1.0
2503-import Ubuntu.Components 0.1
2504+import Ubuntu.Components 1.2
2505 import "../../../../qml/Dash/Previews"
2506 import Unity.Test 0.1 as UT
2507
2508
2509=== modified file 'tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingBoolean.qml'
2510--- tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingBoolean.qml 2015-01-09 09:15:45 +0000
2511+++ tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingBoolean.qml 2015-10-08 09:06:50 +0000
2512@@ -15,7 +15,7 @@
2513 */
2514
2515 import QtQuick 2.0
2516-import Ubuntu.Components 1.1
2517+import Ubuntu.Components 1.2
2518 import QtTest 1.0
2519 import "../../../../qml/Dash/ScopeSettings"
2520 import Unity.Test 0.1 as UT
2521
2522=== modified file 'tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingList.qml'
2523--- tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingList.qml 2014-08-27 08:07:33 +0000
2524+++ tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingList.qml 2015-10-08 09:06:50 +0000
2525@@ -15,7 +15,7 @@
2526 */
2527
2528 import QtQuick 2.0
2529-import Ubuntu.Components 1.1
2530+import Ubuntu.Components 1.2
2531 import QtTest 1.0
2532 import "../../../../qml/Dash/ScopeSettings"
2533 import Unity.Test 0.1 as UT
2534
2535=== modified file 'tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingNumber.qml'
2536--- tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingNumber.qml 2015-01-09 09:15:45 +0000
2537+++ tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingNumber.qml 2015-10-08 09:06:50 +0000
2538@@ -15,7 +15,7 @@
2539 */
2540
2541 import QtQuick 2.0
2542-import Ubuntu.Components 1.1
2543+import Ubuntu.Components 1.2
2544 import QtTest 1.0
2545 import "../../../../qml/Dash/ScopeSettings"
2546 import Unity.Test 0.1 as UT
2547
2548=== modified file 'tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingString.qml'
2549--- tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingString.qml 2015-01-09 09:15:45 +0000
2550+++ tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingString.qml 2015-10-08 09:06:50 +0000
2551@@ -15,7 +15,7 @@
2552 */
2553
2554 import QtQuick 2.0
2555-import Ubuntu.Components 1.1
2556+import Ubuntu.Components 1.2
2557 import QtTest 1.0
2558 import "../../../../qml/Dash/ScopeSettings"
2559 import Unity.Test 0.1 as UT
2560
2561=== modified file 'tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingsWidgetFactory.qml'
2562--- tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingsWidgetFactory.qml 2014-08-26 14:21:29 +0000
2563+++ tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingsWidgetFactory.qml 2015-10-08 09:06:50 +0000
2564@@ -15,7 +15,7 @@
2565 */
2566
2567 import QtQuick 2.0
2568-import Ubuntu.Components 1.1
2569+import Ubuntu.Components 1.2
2570 import QtTest 1.0
2571 import "../../../../qml/Dash/ScopeSettings"
2572 import Unity.Test 0.1 as UT
2573
2574=== modified file 'tests/qmltests/Dash/tst_Card.qml'
2575--- tests/qmltests/Dash/tst_Card.qml 2015-09-18 10:33:09 +0000
2576+++ tests/qmltests/Dash/tst_Card.qml 2015-10-08 09:06:50 +0000
2577@@ -16,7 +16,7 @@
2578
2579 import QtQuick 2.0
2580 import QtTest 1.0
2581-import Ubuntu.Components 0.1
2582+import Ubuntu.Components 1.2
2583 import Unity.Test 0.1 as UT
2584 import "../../../qml/Dash"
2585 import "CardHelpers.js" as Helpers
2586
2587=== modified file 'tests/qmltests/Dash/tst_CardBenchmark.qml'
2588--- tests/qmltests/Dash/tst_CardBenchmark.qml 2014-05-02 14:57:27 +0000
2589+++ tests/qmltests/Dash/tst_CardBenchmark.qml 2015-10-08 09:06:50 +0000
2590@@ -16,7 +16,7 @@
2591
2592 import QtQuick 2.0
2593 import QtTest 1.0
2594-import Ubuntu.Components 0.1
2595+import Ubuntu.Components 1.2
2596 import Unity.Test 0.1 as UT
2597 import "../../../qml/Dash"
2598 import "CardHelpers.js" as Helpers
2599
2600=== modified file 'tests/qmltests/Dash/tst_CardCarousel.qml'
2601--- tests/qmltests/Dash/tst_CardCarousel.qml 2015-08-28 12:39:43 +0000
2602+++ tests/qmltests/Dash/tst_CardCarousel.qml 2015-10-08 09:06:50 +0000
2603@@ -16,7 +16,7 @@
2604
2605 import QtQuick 2.4
2606 import QtTest 1.0
2607-import Ubuntu.Components 1.3
2608+import Ubuntu.Components 1.2
2609 import Unity.Test 0.1 as UT
2610 import "../../../qml/Dash"
2611 import "CardHelpers.js" as Helpers
2612
2613=== modified file 'tests/qmltests/Dash/tst_CardTool.qml'
2614--- tests/qmltests/Dash/tst_CardTool.qml 2015-09-01 08:38:39 +0000
2615+++ tests/qmltests/Dash/tst_CardTool.qml 2015-10-08 09:06:50 +0000
2616@@ -16,7 +16,7 @@
2617
2618 import QtQuick 2.0
2619 import QtTest 1.0
2620-import Ubuntu.Components 0.1
2621+import Ubuntu.Components 1.2
2622 import Unity.Test 0.1 as UT
2623 import "../../../qml/Dash"
2624 import "CardHelpers.js" as Helpers
2625
2626=== modified file 'tests/qmltests/Dash/tst_Dash.qml'
2627--- tests/qmltests/Dash/tst_Dash.qml 2015-07-21 14:27:36 +0000
2628+++ tests/qmltests/Dash/tst_Dash.qml 2015-10-08 09:06:50 +0000
2629@@ -17,7 +17,7 @@
2630 import QtQuick 2.0
2631 import QtTest 1.0
2632 import "../../../qml/Dash"
2633-import Ubuntu.Components 0.1
2634+import Ubuntu.Components 1.2
2635 import Unity.Test 0.1 as UT
2636
2637 Item {
2638
2639=== modified file 'tests/qmltests/Dash/tst_DashContent.qml'
2640--- tests/qmltests/Dash/tst_DashContent.qml 2015-05-07 10:32:17 +0000
2641+++ tests/qmltests/Dash/tst_DashContent.qml 2015-10-08 09:06:50 +0000
2642@@ -18,7 +18,7 @@
2643 import QtTest 1.0
2644 import "../../../qml/Dash"
2645 import "../../../qml/Components"
2646-import Ubuntu.Components 0.1
2647+import Ubuntu.Components 1.2
2648 import Unity 0.2
2649 import Unity.Test 0.1 as UT
2650 import Utils 0.1
2651
2652=== modified file 'tests/qmltests/Dash/tst_DashShell.qml'
2653--- tests/qmltests/Dash/tst_DashShell.qml 2015-08-13 15:51:06 +0000
2654+++ tests/qmltests/Dash/tst_DashShell.qml 2015-10-08 09:06:50 +0000
2655@@ -18,7 +18,7 @@
2656 import QtTest 1.0
2657 import "../../../qml/Dash"
2658 import "../../../qml/"
2659-import Ubuntu.Components 1.3
2660+import Ubuntu.Components 1.2
2661 import Unity.Test 0.1 as UT
2662
2663 Item {
2664
2665=== modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
2666--- tests/qmltests/Dash/tst_GenericScopeView.qml 2015-07-08 09:24:12 +0000
2667+++ tests/qmltests/Dash/tst_GenericScopeView.qml 2015-10-08 09:06:50 +0000
2668@@ -20,7 +20,7 @@
2669 import ".."
2670 import "../../../qml/Dash"
2671 import "../../../qml/Components"
2672-import Ubuntu.Components 1.1
2673+import Ubuntu.Components 1.2
2674 import Unity.Test 0.1 as UT
2675
2676 Item {
2677
2678=== modified file 'tests/qmltests/Dash/tst_PageHeader.qml'
2679--- tests/qmltests/Dash/tst_PageHeader.qml 2015-08-13 14:18:56 +0000
2680+++ tests/qmltests/Dash/tst_PageHeader.qml 2015-10-08 09:06:50 +0000
2681@@ -18,7 +18,7 @@
2682 import QtTest 1.0
2683 import ".."
2684 import "../../../qml/Dash"
2685-import Ubuntu.Components 0.1
2686+import Ubuntu.Components 1.2
2687 import Unity 0.2
2688 import Unity.Test 0.1 as UT
2689
2690
2691=== modified file 'tests/qmltests/Dash/tst_PreviewListView.qml'
2692--- tests/qmltests/Dash/tst_PreviewListView.qml 2015-03-20 17:31:23 +0000
2693+++ tests/qmltests/Dash/tst_PreviewListView.qml 2015-10-08 09:06:50 +0000
2694@@ -16,7 +16,7 @@
2695
2696 import QtQuick 2.0
2697 import QtTest 1.0
2698-import Ubuntu.Components 1.1
2699+import Ubuntu.Components 1.2
2700 import "../../../qml/Dash"
2701 import Unity.Test 0.1 as UT
2702 import Unity 0.2 as Unity
2703
2704=== modified file 'tests/qmltests/Greeter/TestView.qml'
2705--- tests/qmltests/Greeter/TestView.qml 2015-02-23 15:43:41 +0000
2706+++ tests/qmltests/Greeter/TestView.qml 2015-10-08 09:06:50 +0000
2707@@ -15,7 +15,7 @@
2708 */
2709
2710 import QtQuick 2.3
2711-import Ubuntu.Components 1.1
2712+import Ubuntu.Components 1.2
2713 import "../Components"
2714
2715 Item {
2716
2717=== modified file 'tests/qmltests/Greeter/tst_Clock.qml'
2718--- tests/qmltests/Greeter/tst_Clock.qml 2014-10-17 14:55:35 +0000
2719+++ tests/qmltests/Greeter/tst_Clock.qml 2015-10-08 09:06:50 +0000
2720@@ -18,7 +18,7 @@
2721 import QtTest 1.0
2722 import ".."
2723 import "../../../qml/Greeter"
2724-import Ubuntu.Components 0.1
2725+import Ubuntu.Components 1.2
2726 import Unity.Indicators 0.1 as Indicators
2727 import Unity.Test 0.1 as UT
2728
2729
2730=== modified file 'tests/qmltests/Greeter/tst_Greeter.qml'
2731--- tests/qmltests/Greeter/tst_Greeter.qml 2015-09-02 13:06:56 +0000
2732+++ tests/qmltests/Greeter/tst_Greeter.qml 2015-10-08 09:06:50 +0000
2733@@ -18,7 +18,7 @@
2734 import QtTest 1.0
2735 import ".."
2736 import "../../../qml/Greeter"
2737-import Ubuntu.Components 0.1
2738+import Ubuntu.Components 1.2
2739 import AccountsService 0.1
2740 import GSettings 1.0
2741 import IntegratedLightDM 0.1 as LightDM
2742
2743=== modified file 'tests/qmltests/Greeter/tst_Infographics.qml'
2744--- tests/qmltests/Greeter/tst_Infographics.qml 2015-09-16 14:34:56 +0000
2745+++ tests/qmltests/Greeter/tst_Infographics.qml 2015-10-08 09:06:50 +0000
2746@@ -18,7 +18,7 @@
2747 import QtTest 1.0
2748 import ".."
2749 import "../../../qml/Greeter"
2750-import Ubuntu.Components 0.1
2751+import Ubuntu.Components 1.2
2752 import Unity.Test 0.1 as UT
2753 import IntegratedLightDM 0.1 as LightDM
2754
2755
2756=== modified file 'tests/qmltests/Greeter/tst_NarrowView.qml'
2757--- tests/qmltests/Greeter/tst_NarrowView.qml 2015-06-03 21:22:11 +0000
2758+++ tests/qmltests/Greeter/tst_NarrowView.qml 2015-10-08 09:06:50 +0000
2759@@ -19,7 +19,7 @@
2760 import ".."
2761 import "../../../qml/Greeter"
2762 import IntegratedLightDM 0.1 as LightDM
2763-import Ubuntu.Components 0.1
2764+import Ubuntu.Components 1.2
2765 import Unity.Test 0.1 as UT
2766
2767 Item {
2768
2769=== modified file 'tests/qmltests/Greeter/tst_WideView.qml'
2770--- tests/qmltests/Greeter/tst_WideView.qml 2015-06-03 21:22:11 +0000
2771+++ tests/qmltests/Greeter/tst_WideView.qml 2015-10-08 09:06:50 +0000
2772@@ -19,7 +19,7 @@
2773 import ".."
2774 import "../../../qml/Greeter"
2775 import IntegratedLightDM 0.1 as LightDM
2776-import Ubuntu.Components 0.1
2777+import Ubuntu.Components 1.2
2778 import Unity.Test 0.1 as UT
2779
2780 Item {
2781
2782=== modified file 'tests/qmltests/Launcher/tst_Launcher.qml'
2783--- tests/qmltests/Launcher/tst_Launcher.qml 2015-09-29 08:42:59 +0000
2784+++ tests/qmltests/Launcher/tst_Launcher.qml 2015-10-08 09:06:50 +0000
2785@@ -18,7 +18,7 @@
2786 import QtQuick.Layouts 1.1
2787 import QtTest 1.0
2788 import Unity.Test 0.1
2789-import Ubuntu.Components 1.1
2790+import Ubuntu.Components 1.2
2791 import ".."
2792 import "../../../qml/Launcher"
2793 import Unity.Launcher 0.1
2794
2795=== modified file 'tests/qmltests/Notifications/tst_OptionToggle.qml'
2796--- tests/qmltests/Notifications/tst_OptionToggle.qml 2015-01-26 14:25:29 +0000
2797+++ tests/qmltests/Notifications/tst_OptionToggle.qml 2015-10-08 09:06:50 +0000
2798@@ -21,7 +21,7 @@
2799 import QtTest 1.0
2800 import ".."
2801 import "../../../qml/Notifications"
2802-import Ubuntu.Components 0.1
2803+import Ubuntu.Components 1.2
2804 import Unity.Test 0.1
2805 import Unity.Notifications 1.0
2806 import QtMultimedia 5.0
2807
2808=== modified file 'tests/qmltests/Notifications/tst_SwipeToAct.qml'
2809--- tests/qmltests/Notifications/tst_SwipeToAct.qml 2015-09-22 14:23:44 +0000
2810+++ tests/qmltests/Notifications/tst_SwipeToAct.qml 2015-10-08 09:06:50 +0000
2811@@ -20,7 +20,7 @@
2812 import ".."
2813 import "../../../qml/Notifications"
2814 import "../../../qml/Components/UnityInputInfo"
2815-import Ubuntu.Components 0.1
2816+import Ubuntu.Components 1.2
2817 import Unity.Test 0.1
2818 import Unity.Notifications 1.0
2819
2820
2821=== modified file 'tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml'
2822--- tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml 2015-01-09 09:15:45 +0000
2823+++ tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml 2015-10-08 09:06:50 +0000
2824@@ -18,7 +18,7 @@
2825 import QtTest 1.0
2826 import ".."
2827 import "../../../qml/Notifications"
2828-import Ubuntu.Components 0.1
2829+import Ubuntu.Components 1.2
2830 import Unity.Test 0.1
2831 import Unity.Notifications 1.0
2832
2833
2834=== modified file 'tests/qmltests/Panel/IndicatorTest.qml'
2835--- tests/qmltests/Panel/IndicatorTest.qml 2015-01-20 16:21:07 +0000
2836+++ tests/qmltests/Panel/IndicatorTest.qml 2015-10-08 09:06:50 +0000
2837@@ -18,7 +18,7 @@
2838 import QtQuick.Layouts 1.1
2839 import QtTest 1.0
2840 import "../../../qml/Panel"
2841-import Ubuntu.Components 0.1
2842+import Ubuntu.Components 1.2
2843 import Unity.Test 0.1 as UT
2844 import Unity.Indicators 0.1 as Indicators
2845
2846
2847=== modified file 'tests/qmltests/Panel/Indicators/tst_IndicatorsLight.qml'
2848--- tests/qmltests/Panel/Indicators/tst_IndicatorsLight.qml 2015-09-02 13:42:24 +0000
2849+++ tests/qmltests/Panel/Indicators/tst_IndicatorsLight.qml 2015-10-08 09:06:50 +0000
2850@@ -18,7 +18,7 @@
2851 import QtQuick.Layouts 1.1
2852 import Unity.Test 0.1 as UT
2853 import Unity.Indicators 0.1 as Indicators
2854-import Ubuntu.Components 1.1
2855+import Ubuntu.Components 1.2
2856 import Powerd 0.1
2857 import Lights 0.1
2858 import QMenuModel 0.1
2859
2860=== modified file 'tests/qmltests/Panel/tst_IndicatorItem.qml'
2861--- tests/qmltests/Panel/tst_IndicatorItem.qml 2015-08-04 07:02:08 +0000
2862+++ tests/qmltests/Panel/tst_IndicatorItem.qml 2015-10-08 09:06:50 +0000
2863@@ -17,7 +17,7 @@
2864 import QtQuick 2.1
2865 import QtQuick.Layouts 1.1
2866 import QtTest 1.0
2867-import Ubuntu.Components 0.1
2868+import Ubuntu.Components 1.2
2869 import Unity.Test 0.1 as UT
2870 import "../../../qml/Panel"
2871
2872
2873=== modified file 'tests/qmltests/Panel/tst_IndicatorItemRow.qml'
2874--- tests/qmltests/Panel/tst_IndicatorItemRow.qml 2014-10-17 14:55:35 +0000
2875+++ tests/qmltests/Panel/tst_IndicatorItemRow.qml 2015-10-08 09:06:50 +0000
2876@@ -18,7 +18,7 @@
2877 import QtQuick.Layouts 1.1
2878 import QtTest 1.0
2879 import "../../../qml/Panel"
2880-import Ubuntu.Components 0.1
2881+import Ubuntu.Components 1.2
2882 import Unity.Test 0.1 as UT
2883 import Unity.Indicators 0.1 as Indicators
2884
2885
2886=== modified file 'tests/qmltests/Panel/tst_IndicatorsBar.qml'
2887--- tests/qmltests/Panel/tst_IndicatorsBar.qml 2015-01-09 09:15:45 +0000
2888+++ tests/qmltests/Panel/tst_IndicatorsBar.qml 2015-10-08 09:06:50 +0000
2889@@ -18,7 +18,7 @@
2890 import QtQuick.Layouts 1.1
2891 import QtTest 1.0
2892 import "../../../qml/Panel"
2893-import Ubuntu.Components 0.1
2894+import Ubuntu.Components 1.2
2895 import Unity.Test 0.1 as UT
2896 import Unity.Indicators 0.1 as Indicators
2897
2898
2899=== modified file 'tests/qmltests/Panel/tst_IndicatorsMenu.qml'
2900--- tests/qmltests/Panel/tst_IndicatorsMenu.qml 2015-06-22 09:25:11 +0000
2901+++ tests/qmltests/Panel/tst_IndicatorsMenu.qml 2015-10-08 09:06:50 +0000
2902@@ -18,7 +18,7 @@
2903 import QtQuick.Layouts 1.1
2904 import QtTest 1.0
2905 import "../../../qml/Panel"
2906-import Ubuntu.Components 0.1
2907+import Ubuntu.Components 1.2
2908 import Unity.Test 0.1 as UT
2909 import Unity.Indicators 0.1 as Indicators
2910
2911
2912=== modified file 'tests/qmltests/Panel/tst_Panel.qml'
2913--- tests/qmltests/Panel/tst_Panel.qml 2015-06-29 03:49:25 +0000
2914+++ tests/qmltests/Panel/tst_Panel.qml 2015-10-08 09:06:50 +0000
2915@@ -18,7 +18,7 @@
2916 import QtQuick.Layouts 1.1
2917 import QtTest 1.0
2918 import Unity.Test 0.1
2919-import Ubuntu.Components 0.1
2920+import Ubuntu.Components 1.2
2921 import Unity.Application 0.1
2922 import Unity.Indicators 0.1 as Indicators
2923 import Ubuntu.Telephony 0.1 as Telephony
2924
2925=== modified file 'tests/qmltests/Stages/ApplicationCheckBox.qml'
2926--- tests/qmltests/Stages/ApplicationCheckBox.qml 2015-06-19 18:19:33 +0000
2927+++ tests/qmltests/Stages/ApplicationCheckBox.qml 2015-10-08 09:06:50 +0000
2928@@ -16,7 +16,7 @@
2929
2930 import QtQuick 2.0
2931 import QtQuick.Layouts 1.1
2932-import Ubuntu.Components 1.1
2933+import Ubuntu.Components 1.2
2934 import Unity.Application 0.1
2935
2936 RowLayout {
2937
2938=== modified file 'tests/qmltests/Stages/RecursingChildSessionControl.qml'
2939--- tests/qmltests/Stages/RecursingChildSessionControl.qml 2015-02-12 18:58:35 +0000
2940+++ tests/qmltests/Stages/RecursingChildSessionControl.qml 2015-10-08 09:06:50 +0000
2941@@ -16,7 +16,7 @@
2942
2943 import QtQuick 2.1
2944 import QtQuick.Layouts 1.1
2945-import Ubuntu.Components 0.1
2946+import Ubuntu.Components 1.2
2947 import Unity.Application 0.1
2948
2949 ColumnLayout {
2950
2951=== modified file 'tests/qmltests/Stages/tst_ApplicationWindow.qml'
2952--- tests/qmltests/Stages/tst_ApplicationWindow.qml 2015-09-02 08:04:41 +0000
2953+++ tests/qmltests/Stages/tst_ApplicationWindow.qml 2015-10-08 09:06:50 +0000
2954@@ -20,8 +20,8 @@
2955 import Unity.Test 0.1 as UT
2956 import ".."
2957 import "../../../qml/Stages"
2958-import Ubuntu.Components 0.1
2959-import Ubuntu.Components.ListItems 1.0 as ListItem
2960+import Ubuntu.Components 1.2
2961+import Ubuntu.Components.ListItems 1.2 as ListItem
2962 import Unity.Application 0.1
2963
2964 Rectangle {
2965
2966=== modified file 'tests/qmltests/Stages/tst_DesktopStage.qml'
2967--- tests/qmltests/Stages/tst_DesktopStage.qml 2015-09-17 12:25:29 +0000
2968+++ tests/qmltests/Stages/tst_DesktopStage.qml 2015-10-08 09:06:50 +0000
2969@@ -16,8 +16,8 @@
2970
2971 import QtQuick 2.0
2972 import QtTest 1.0
2973-import Ubuntu.Components 1.1
2974-import Ubuntu.Components.ListItems 1.0 as ListItem
2975+import Ubuntu.Components 1.2
2976+import Ubuntu.Components.ListItems 1.2 as ListItem
2977 import Unity.Application 0.1
2978 import Unity.Test 0.1
2979 import Utils 0.1
2980
2981=== modified file 'tests/qmltests/Stages/tst_PhoneStage.qml'
2982--- tests/qmltests/Stages/tst_PhoneStage.qml 2015-08-12 15:08:09 +0000
2983+++ tests/qmltests/Stages/tst_PhoneStage.qml 2015-10-08 09:06:50 +0000
2984@@ -19,7 +19,7 @@
2985 import Unity.Test 0.1 as UT
2986 import ".."
2987 import "../../../qml/Stages"
2988-import Ubuntu.Components 0.1
2989+import Ubuntu.Components 1.2
2990 import Unity.Application 0.1
2991
2992 Item {
2993
2994=== modified file 'tests/qmltests/Stages/tst_SessionContainer.qml'
2995--- tests/qmltests/Stages/tst_SessionContainer.qml 2015-03-06 04:44:11 +0000
2996+++ tests/qmltests/Stages/tst_SessionContainer.qml 2015-10-08 09:06:50 +0000
2997@@ -18,7 +18,7 @@
2998 import QtQuick.Layouts 1.1
2999 import QtTest 1.0
3000 import Unity.Test 0.1 as UT
3001-import Ubuntu.Components 0.1
3002+import Ubuntu.Components 1.2
3003 import Unity.Application 0.1
3004 import "../../../qml/Stages"
3005
3006
3007=== modified file 'tests/qmltests/Stages/tst_Splash.qml'
3008--- tests/qmltests/Stages/tst_Splash.qml 2014-09-15 19:05:32 +0000
3009+++ tests/qmltests/Stages/tst_Splash.qml 2015-10-08 09:06:50 +0000
3010@@ -19,7 +19,7 @@
3011 import Unity.Test 0.1 as UT
3012 import ".."
3013 import "../../../qml/Stages"
3014-import Ubuntu.Components 0.1
3015+import Ubuntu.Components 1.2
3016 import Unity.Application 0.1
3017
3018 Rectangle {
3019
3020=== modified file 'tests/qmltests/Stages/tst_SpreadDelegate.qml'
3021--- tests/qmltests/Stages/tst_SpreadDelegate.qml 2015-03-06 04:44:11 +0000
3022+++ tests/qmltests/Stages/tst_SpreadDelegate.qml 2015-10-08 09:06:50 +0000
3023@@ -19,8 +19,8 @@
3024 import Unity.Test 0.1 as UT
3025 import ".."
3026 import "../../../qml/Stages"
3027-import Ubuntu.Components 0.1
3028-import Ubuntu.Components.ListItems 1.0 as ListItem
3029+import Ubuntu.Components 1.2
3030+import Ubuntu.Components.ListItems 1.2 as ListItem
3031 import Unity.Application 0.1
3032
3033 Rectangle {
3034
3035=== modified file 'tests/qmltests/Stages/tst_SurfaceContainer.qml'
3036--- tests/qmltests/Stages/tst_SurfaceContainer.qml 2015-08-03 15:00:47 +0000
3037+++ tests/qmltests/Stages/tst_SurfaceContainer.qml 2015-10-08 09:06:50 +0000
3038@@ -19,7 +19,7 @@
3039 import Unity.Test 0.1
3040 import ".."
3041 import "../../../qml/Stages"
3042-import Ubuntu.Components 0.1
3043+import Ubuntu.Components 1.2
3044 import Unity.Application 0.1
3045
3046 Rectangle {
3047
3048=== modified file 'tests/qmltests/Stages/tst_TabletStage.qml'
3049--- tests/qmltests/Stages/tst_TabletStage.qml 2015-09-02 14:26:43 +0000
3050+++ tests/qmltests/Stages/tst_TabletStage.qml 2015-10-08 09:06:50 +0000
3051@@ -16,8 +16,8 @@
3052
3053 import QtQuick 2.0
3054 import QtTest 1.0
3055-import Ubuntu.Components 1.1
3056-import Ubuntu.Components.ListItems 1.0 as ListItem
3057+import Ubuntu.Components 1.2
3058+import Ubuntu.Components.ListItems 1.2 as ListItem
3059 import Unity.Application 0.1
3060 import Unity.Test 0.1
3061
3062
3063=== modified file 'tests/qmltests/Stages/tst_WindowMoveResizeArea.qml'
3064--- tests/qmltests/Stages/tst_WindowMoveResizeArea.qml 2015-09-07 13:45:50 +0000
3065+++ tests/qmltests/Stages/tst_WindowMoveResizeArea.qml 2015-10-08 09:06:50 +0000
3066@@ -20,8 +20,8 @@
3067 import Unity.Test 0.1 as UT
3068 import ".."
3069 import "../../../qml/Stages"
3070-import Ubuntu.Components 0.1
3071-import Ubuntu.Components.ListItems 1.0 as ListItem
3072+import Ubuntu.Components 1.2
3073+import Ubuntu.Components.ListItems 1.2 as ListItem
3074 import Unity.Application 0.1
3075
3076 Item {
3077
3078=== modified file 'tests/qmltests/Tutorial/tst_Tutorial.qml'
3079--- tests/qmltests/Tutorial/tst_Tutorial.qml 2015-08-25 21:37:39 +0000
3080+++ tests/qmltests/Tutorial/tst_Tutorial.qml 2015-10-08 09:06:50 +0000
3081@@ -18,7 +18,7 @@
3082 import QtTest 1.0
3083 import AccountsService 0.1
3084 import IntegratedLightDM 0.1 as LightDM
3085-import Ubuntu.Components 1.1
3086+import Ubuntu.Components 1.2
3087 import Unity.Application 0.1
3088 import Unity.Test 0.1 as UT
3089
3090
3091=== modified file 'tests/qmltests/Wizard/tst_Wizard.qml'
3092--- tests/qmltests/Wizard/tst_Wizard.qml 2015-10-01 23:51:40 +0000
3093+++ tests/qmltests/Wizard/tst_Wizard.qml 2015-10-08 09:06:50 +0000
3094@@ -19,7 +19,7 @@
3095 import AccountsService 0.1
3096 import MeeGo.QOfono 0.2
3097 import QMenuModel 0.1
3098-import Ubuntu.Components 1.1
3099+import Ubuntu.Components 1.2
3100 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
3101 import Unity.Test 0.1 as UT
3102 import Wizard 0.1
3103
3104=== modified file 'tests/qmltests/tst_OrientedShell.qml'
3105--- tests/qmltests/tst_OrientedShell.qml 2015-09-21 13:37:47 +0000
3106+++ tests/qmltests/tst_OrientedShell.qml 2015-10-08 09:06:50 +0000
3107@@ -17,8 +17,8 @@
3108 import QtQuick 2.0
3109 import QtQuick.Layouts 1.1
3110 import QtTest 1.0
3111-import Ubuntu.Components 1.1
3112-import Ubuntu.Components.ListItems 1.0 as ListItem
3113+import Ubuntu.Components 1.2
3114+import Ubuntu.Components.ListItems 1.2 as ListItem
3115 import Unity.Application 0.1
3116 import Unity.Test 0.1
3117 import IntegratedLightDM 0.1 as LightDM
3118
3119=== modified file 'tests/qmltests/tst_Shell.qml'
3120--- tests/qmltests/tst_Shell.qml 2015-09-18 12:05:32 +0000
3121+++ tests/qmltests/tst_Shell.qml 2015-10-08 09:06:50 +0000
3122@@ -19,8 +19,8 @@
3123 import AccountsService 0.1
3124 import GSettings 1.0
3125 import IntegratedLightDM 0.1 as LightDM
3126-import Ubuntu.Components 1.1
3127-import Ubuntu.Components.ListItems 1.0 as ListItem
3128+import Ubuntu.Components 1.2
3129+import Ubuntu.Components.ListItems 1.2 as ListItem
3130 import Ubuntu.Telephony 0.1 as Telephony
3131 import Unity.Application 0.1
3132 import Unity.Connectivity 0.1
3133
3134=== modified file 'tests/qmltests/tst_ShellWithPin.qml'
3135--- tests/qmltests/tst_ShellWithPin.qml 2015-09-02 13:42:24 +0000
3136+++ tests/qmltests/tst_ShellWithPin.qml 2015-10-08 09:06:50 +0000
3137@@ -15,7 +15,7 @@
3138 */
3139
3140 import QtQuick 2.0
3141-import Ubuntu.Components 1.0
3142+import Ubuntu.Components 1.2
3143 import QtTest 1.0
3144 import AccountsService 0.1
3145 import GSettings 1.0
3146
3147=== added directory 'tests/sdk'
3148=== added file 'tests/sdk/CMakeLists.txt'
3149--- tests/sdk/CMakeLists.txt 1970-01-01 00:00:00 +0000
3150+++ tests/sdk/CMakeLists.txt 2015-10-08 09:06:50 +0000
3151@@ -0,0 +1,6 @@
3152+
3153+#
3154+# Test that all imports for Ubuntu.Components use the wanted version
3155+#
3156+
3157+add_test(SDK ${CMAKE_CURRENT_SOURCE_DIR}/check_sdk.py ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
3158
3159=== added file 'tests/sdk/check_sdk.py'
3160--- tests/sdk/check_sdk.py 1970-01-01 00:00:00 +0000
3161+++ tests/sdk/check_sdk.py 2015-10-08 09:06:50 +0000
3162@@ -0,0 +1,117 @@
3163+#! /usr/bin/env python3
3164+
3165+#
3166+# Copyright (C) 2015 Canonical Ltd
3167+#
3168+# This program is free software: you can redistribute it and/or modify
3169+# it under the terms of the GNU General Public License version 3 as
3170+# published by the Free Software Foundation.
3171+#
3172+# This program is distributed in the hope that it will be useful,
3173+# but WITHOUT ANY WARRANTY; without even the implied warranty of
3174+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3175+# GNU General Public License for more details.
3176+#
3177+# You should have received a copy of the GNU General Public License
3178+# along with this program. If not, see <http://www.gnu.org/licenses/>.
3179+#
3180+# Authored by: Michi Henning <michi.henning@canonical.com>
3181+#
3182+
3183+#
3184+# Little helper program to test that all source files import
3185+# the wanted SDK version
3186+#
3187+# Usage: check_sdk.py directory [ignore_prefix]
3188+#
3189+# The directory specifies the (recursive) location of the source files. Any
3190+# files with a path that starts with ignore_prefix are not checked. This is
3191+# useful to exclude files that are generated into the build directory.
3192+#
3193+# See the file_pat definition below for a list of files that are checked.
3194+#
3195+
3196+from __future__ import print_function
3197+
3198+import argparse
3199+import os
3200+import re
3201+import sys
3202+
3203+
3204+# Print msg on stderr, preceded by program name and followed by newline
3205+def error(msg):
3206+ print(os.path.basename(sys.argv[0]) + ": " + msg, file=sys.stderr)
3207+
3208+
3209+# Function to raise errors encountered by os.walk
3210+def raise_error(e):
3211+ raise e
3212+
3213+# Scan lines in file_path for bad SDK version. For each file,
3214+# print the line numbers that have SDK version issues
3215+
3216+ubuntu_components_pat = re.compile(r'.*import Ubuntu.Components.*')
3217+ubuntu_good_components_pat = re.compile(r'.*import Ubuntu.Components.*1\.2.*')
3218+# Ubuntu.Components.Themes only has 0.1 and 1.3
3219+# 0.1 is actually 1.2
3220+ubuntu_good_components_themes_pat = re.compile(r'.*import Ubuntu.Components.Themes 0\.1.*')
3221+
3222+def scan_for_bad_sdk(file_path):
3223+ global ubuntu_components_pat
3224+ errors = []
3225+ with open(file_path, 'rt', encoding='utf-8') as ifile:
3226+ for lino, line in enumerate(ifile, start=1):
3227+ if ubuntu_components_pat.match(line) and not (ubuntu_good_components_pat.match(line) or ubuntu_good_components_themes_pat.match(line)):
3228+ errors.append(lino)
3229+ if 0 < len(errors) <= 10:
3230+ if len(errors) > 1:
3231+ plural = 's'
3232+ else:
3233+ plural = ''
3234+ print(
3235+ "%s: bad SDK Version in line%s %s" % (
3236+ file_path, plural, ", ".join((str(i) for i in errors))))
3237+ elif errors:
3238+ print("%s: bad SDK Version in multiple lines" % file_path)
3239+ return bool(errors)
3240+
3241+# Parse args
3242+
3243+parser = argparse.ArgumentParser(
3244+ description='Test that source files contain the wanted SDK version.')
3245+parser.add_argument(
3246+ 'dir', nargs=1,
3247+ help='The directory to (recursively) search for source files')
3248+parser.add_argument(
3249+ 'ignore_prefix', nargs='?', default=None,
3250+ help='Ignore source files with a path that starts with the given prefix.')
3251+args = parser.parse_args()
3252+
3253+# Files we want to check for SDK version.
3254+
3255+file_pat = (
3256+ r'(.*\.(js|qml)$)')
3257+pat = re.compile(file_pat)
3258+
3259+# Find all the files with matching file extension in the specified
3260+# directory and check them
3261+
3262+directory = os.path.abspath(args.dir[0])
3263+ignore = args.ignore_prefix and os.path.abspath(args.ignore_prefix) or None
3264+
3265+found_bad_sdk = False
3266+try:
3267+ for root, dirs, files in os.walk(directory, onerror=raise_error):
3268+ for file in files:
3269+ path = os.path.join(root, file)
3270+ if not (ignore and path.startswith(ignore)) and pat.match(file):
3271+ if scan_for_bad_sdk(path):
3272+ found_bad_sdk = True
3273+
3274+except OSError as e:
3275+ error("cannot create file list for \"" + dir + "\": " + e.strerror)
3276+ sys.exit(1)
3277+
3278+if found_bad_sdk:
3279+ sys.exit(1)
3280
3281=== modified file 'tests/utils/modules/Unity/Test/MouseTouchEmulationCheckbox.qml'
3282--- tests/utils/modules/Unity/Test/MouseTouchEmulationCheckbox.qml 2015-04-13 13:12:18 +0000
3283+++ tests/utils/modules/Unity/Test/MouseTouchEmulationCheckbox.qml 2015-10-08 09:06:50 +0000
3284@@ -16,7 +16,7 @@
3285
3286 import QtQuick 2.0
3287 import QtQuick.Layouts 1.1
3288-import Ubuntu.Components 1.1
3289+import Ubuntu.Components 1.2
3290 import Unity.Test 0.1
3291
3292 RowLayout {
3293
3294=== modified file 'tests/utils/modules/Unity/Test/UnityTestCase.qml'
3295--- tests/utils/modules/Unity/Test/UnityTestCase.qml 2015-07-23 07:30:25 +0000
3296+++ tests/utils/modules/Unity/Test/UnityTestCase.qml 2015-10-08 09:06:50 +0000
3297@@ -16,7 +16,7 @@
3298
3299 import QtQuick 2.0
3300 import QtTest 1.0
3301-import Ubuntu.Components 0.1
3302+import Ubuntu.Components 1.2
3303 import Unity.Test 0.1 as UT
3304
3305 TestCase {

Subscribers

People subscribed via source and target branches