Merge lp:~aacid/unity8/use_sdk12 into lp:unity8
| Status: | Rejected |
|---|---|
| Rejected by: | Michał Sawicz on 2015-10-26 |
| 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 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Michał Sawicz | 2015-10-02 | Disapprove on 2015-10-26 | |
| PS Jenkins bot | continuous-integration | Needs Fixing on 2015-10-08 | |
|
Review via email:
|
|||
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
- 1996. By Albert Astals Cid on 2015-10-02
-
Allow for import Ubuntu.
Components. Themes 0.1
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1996
http://
Executed test runs:
UNSTABLE: http://
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
- 1997. By Albert Astals Cid on 2015-10-08
-
Merge
- 1998. By Albert Astals Cid on 2015-10-08
-
Fix tests
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1997
http://
Executed test runs:
UNSTABLE: http://
UNSTABLE: http://
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:1998
http://
Executed test runs:
UNSTABLE: http://
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
| 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 :/
| 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
Unmerged revisions
- 1998. By Albert Astals Cid on 2015-10-08
-
Fix tests
- 1997. By Albert Astals Cid on 2015-10-08
-
Merge
- 1996. By Albert Astals Cid on 2015-10-02
-
Allow for import Ubuntu.
Components. Themes 0.1 - 1995. By Albert Astals Cid on 2015-10-02
-
Use SDK 1.2 all over the board

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