Merge lp:~dobey/unity8/processing-indterminate into lp:unity8

Proposed by dobey
Status: Superseded
Proposed branch: lp:~dobey/unity8/processing-indterminate
Merge into: lp:unity8
Diff against target: 629 lines (+145/-62)
20 files modified
CMakeLists.txt (+1/-1)
debian/control (+6/-4)
plugins/Ubuntu/DownloadDaemonListener/CMakeLists.txt (+3/-1)
plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.cpp (+2/-1)
plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.h (+2/-1)
plugins/Ubuntu/DownloadDaemonListener/interface/downloadtrackeradaptor.cpp (+2/-2)
plugins/Ubuntu/DownloadDaemonListener/interface/downloadtrackeradaptor.h (+71/-4)
plugins/Ubuntu/DownloadDaemonListener/interface/metatypes.h (+3/-6)
qml/Dash/Previews/PreviewProgress.qml (+5/-1)
qml/Stages/TabletStage.qml (+1/-1)
tests/mocks/Ubuntu/DownloadDaemonListener/MockDownloadTracker.cpp (+3/-1)
tests/mocks/Ubuntu/DownloadDaemonListener/MockDownloadTracker.h (+2/-1)
tests/mocks/Unity/Application/ApplicationInfo.cpp (+0/-8)
tests/mocks/Unity/Application/ApplicationInfo.h (+0/-4)
tests/mocks/Unity/Application/ApplicationManager.cpp (+0/-10)
tests/plugins/Unity/Launcher/launchermodeltest.cpp (+0/-2)
tests/qmltests/Dash/Previews/tst_PreviewProgress.qml (+14/-1)
tests/qmltests/Stages/tst_TabletStage.qml (+6/-3)
tests/qmltests/tst_OrientedShell.qml (+10/-6)
tests/qmltests/tst_Shell.qml (+14/-4)
To merge this branch: bzr merge lp:~dobey/unity8/processing-indterminate
Reviewer Review Type Date Requested Status
Albert Astals Cid (community) Approve
Unity8 CI Bot continuous-integration Needs Fixing
Ubuntu Unity PS integration team packaging Pending
Review via email: mp+300123@code.launchpad.net

This proposal has been superseded by a proposal from 2016-08-08.

Commit message

Set progress bar indeterminate when processing signal received.

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.

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

Yes.

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

N/A

To post a comment you must log in.
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2543
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1746/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/2296/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2324
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2224
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2224
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2224
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2217/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2217/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2217/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2217/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2217/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2217/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2217/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2217/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2217/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1746/rebuild

review: Needs Fixing (continuous-integration)
2544. By dobey

Just include the system metatypes.h to always be up to date.

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2544
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1753/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/2304/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2332
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2232
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2232
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2232
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2225/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2225/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2225/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2225/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2225/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2225/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2225/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2225/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2225/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1753/rebuild

review: Needs Fixing (continuous-integration)
2545. By dobey

Add libubuntu-download-manager-common-dev to build-depends for header.

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2545
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1755/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/2306/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2334
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2233
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2233
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2233
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2226/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2226/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2226/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2226/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2226/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2226/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2226/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2226/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2226/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1755/rebuild

review: Needs Fixing (continuous-integration)
2546. By dobey

Need to link to udm-common.

2547. By dobey

The whitespace test is awful.

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2546
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1759/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/2310/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2338
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2236
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2236
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2236
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2229/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2229/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2229/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2229/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2229/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2229/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2229/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2229/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2229/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1759/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2547
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1760/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2311
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1231
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1231
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1231
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2339
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2237
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2237
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2237
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2230
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2230/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2230
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2230/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2230
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2230/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2230
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2230/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2230
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2230/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2230
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2230/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2230
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2230/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2230
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2230/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2230
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2230/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1760/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

file:///home/tsdgeos_work/phablet/unity8/processing-indterminate/tests/qmltests/Dash/Previews/tst_PreviewProgress.qml:48:5: Type PreviewProgress unavailable
         PreviewProgress {
         ^
file:///home/tsdgeos_work/phablet/unity8/processing-indterminate/qml/Dash/Previews/PreviewProgress.qml:62:13: Cannot assign to non-existent property "onProcessing"
                 onProcessing: {

You need to update the mock DownloadTracker in tests/mocks/Ubuntu/DownloadDaemonListener/

review: Needs Fixing
2548. By dobey

Update the tests too.

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :
review: Needs Fixing (continuous-integration)
2549. By dobey

Processing doesn't call root triggered signal.

2550. By dobey

[ Daniel d'Andrada ]
Make use of MirSurface::inputBounds and drop UbuntuKeyboardInfo hack

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2550
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1790/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2344
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1252
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1252
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1252
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2372
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2258
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2258
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2258
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2251
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2251/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2251
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2251/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2251
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2251/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2251
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2251/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2251
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2251/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2251
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2251/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2251
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2251/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2251
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2251/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2251
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2251/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1790/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

previewProgress.progressBar doesn't exist, you need to use findChild as i suggested.

review: Needs Fixing
2551. By dobey

Use findChild instead.

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2551
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1809/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2364
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1271
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1271
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1271
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2392
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2279
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2279
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2279
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2272
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2272/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2272
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2272/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2272
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2272/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2272
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2272/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2272
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2272/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2272
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2272/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2272
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2272/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2272
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2272/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2272
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2272/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1809/rebuild

review: Needs Fixing (continuous-integration)
2552. By dobey

Update copyright years in chagned files.
Do a second findChild in the test.

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2552
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1824/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2381
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1282
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1282
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1282
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2409
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2296
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2296
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2296
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2289
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2289/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2289
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2289/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2289
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2289/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2289
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2289/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2289
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2289/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2289
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2289/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2289
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2289/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2289
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2289/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2289
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2289/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1824/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

the tryCompare call is wrong, you need 3 params there

tryCompare(progressBar, "indeterminate", true);

review: Needs Fixing
2553. By dobey

tryCompare is apparently inconsistent with Compare.

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2553
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1836/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2394
    FAILURE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1294/console
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1294
    FAILURE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1294/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2422
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2309
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2309
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2309
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2302
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2302/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2302
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2302/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2302
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2302/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2302
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2302/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2302
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2302/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2302
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2302/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2302
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2302/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2302
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2302/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2302
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2302/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1836/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

Have you shown this to someone in Design? In my opinion (which doesn't count much since i'm not in Design :D) this looks worse than just sticking at 100% for a few seconds more.

review: Needs Information
2554. By dobey

[ Zoltán Balogh ]
* Bump the version to secure UITK compatibility
[ Albert Astals Cid ]
* Pass the correct number of arguments to mapToItem (LP: #1606835)
* Rebuild against Qt 5.6.
* Add https://code.launchpad.net/~aacid/unity8/floor_includes/+merge/300850

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2554
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1849/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2413
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1307
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1307
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1307
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2441
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2328
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2328
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2328
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2321
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2321/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2321
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2321/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2321
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2321/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2321
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2321/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2321
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2321/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2321
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2321/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2321
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2321/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2321
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2321/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2321
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2321/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1849/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
dobey (dobey) wrote :

> Have you shown this to someone in Design? In my opinion (which doesn't count
> much since i'm not in Design :D) this looks worse than just sticking at 100%
> for a few seconds more.

I asked Paty to comment on the bug. FWIW, switching to indeterminate is also what Android does in the Play Store when download is finished and install starts. If the current result of that on Ubuntu "looks worse" as you say, then this seems like a problem with how indeterminate state is rendered, and thus a bug with UITK, and not this branch.

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

Ok, let's show it to the world and if they disagree we fix it later on.

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

 * Did CI run pass? If not, please explain why.
Yes

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

Can you please resubmit with lp:~dandrader/unity8/removeApplicationStage as a prerequisite, they conflict in debian/control.

While at it, if you could please undo the two hunks where the generated file gained:

../../../../../../ubuntu-download-manager/trunk/docs/dbus/com.canonical.applications.download.xml

Or make those paths absolute, as appropriate, I'd be grateful.

Revision history for this message
dobey (dobey) wrote :

> Can you please resubmit with lp:~dandrader/unity8/removeApplicationStage as a
> prerequisite, they conflict in debian/control.
>
> While at it, if you could please undo the two hunks where the generated file
> gained:
>
> ../../../../../../ubuntu-download-
> manager/trunk/docs/dbus/com.canonical.applications.download.xml
>
> Or make those paths absolute, as appropriate, I'd be grateful.

This is because the u-d-m packages do not include the dbus API definition xml files in the packages, and so the ../../../ mess is pointing to a checkout in my home directory. Full paths would not be helpful here, without the xml files being installed in the u-d-m packaging anywhere. I've filed bug #1611051 about this issue, so hopefully we can instead add a build rule to make this easier to maintain in the future, and it will have sensible paths in the generated code.

2555. By dobey

Merged dandrader's branch.

2556. By dobey

[ Albert Astals Cid ]
* Take into account carousel selectedItemScaleFactor when setting card
  fixedArtShapeSize (LP: #1599238)
* Remove unused LimitProxyModel
* Do not calculate implicitHeight for Cards in a CardGrid
* Small clazy fixes
[ Daniel d'Andrada ]
* Remove stage property from Application
[ Larry Price ]
* Allow libertine-scope to show empty search result hint unmodified.
  (LP: #1606693)
[ Lukáš Tinkl ]
* Open the quicklist (context) menu also using the Menu key (LP:
  #1608265)
* Fix incorrect SIM PIN dialog position when entering a wrong PIN (LP:
  #1596076)
* Apply the correct keymap also on prompt surfaces (LP: #1610124)
* Implement an optional system update feature during OOBE wizard (LP:
  #1580785)
* Implement a page for choosing HW keyboard layout in OOBE wizard
[ Michael Zanetti ]
* Clean up some build script legacy
* Add a crossbuilder_post file to make crossbuilder restart unity8
  after deploying
* fixes for the automatic switching between usage modes (LP: #1590944)
[ Omer Akram ]
* Add object names for setup wizard
[ Albert Astals Cid ]
* Fix DisabledScreenNotice::test_rotation
* Make the delegate of DashNavigationList an async Loader
* unity-scope-tool: Use parse instead of process
* VerticalJournal improvements regarding model insertions and item
  height changes (LP: #1599754)
* Add math.h includes for compilation in yakkety (LP: #1605502)
[ Andrea Cimitan ]
* Unfocus the search text field in the dash page header when requested
  (LP: #1590820)
* Use binding for filter popover contentWidth (LP: #1595116)
* Add few sourceSize for Image we forgot (LP: #1595113)
* Replace Flickable with an Item inside DashPageHeader for
  headerContainer (LP: #1599235)
[ Albert Astals Cid, Andrea Cimitan ]
* Unbox the artshapeLoader
[ Daniel d'Andrada ]
* Fix splashscreen orientation when app rotates own contents (LP:
  #1586050)
* tst_PreviewIconActions: Make test name match filename
* Cursor: make its size grid unit based (LP: #1604014)
* TouchEventSequenceWrapper: item might get deleted when touch
  sequence is committed (LP: #1607686)
[ Lukáš Tinkl ]
* Implement frontend support for running keyboard indicator
* Provide window/surface close shortcuts across all the stages (LP:
  #1578392, #1606528)
* Restart the location trust prompt service when exiting the wizard
  (LP: #1594430)
* Implement clearing the search and closing the panel on pressing
  Escape key in the dash header
* Fix log timestamps (LP: #1602196)
* Don't display the mode switch warning dialog on tablets (LP:
  #1600290)
[ Michael Terry ]
* Fix indicator profile bug that caused sound indicator to say Mute
  instead of Silent Mode. (LP: #1604205)
* Fix lockscreen appearing right after unlocking a locked session on
  the desktop. (LP: #1604374)
[ Michał Sawicz ]
* Add arm64 support, drop unnecessary B-D on web plugin

Unmerged revisions

2556. By dobey

[ Albert Astals Cid ]
* Take into account carousel selectedItemScaleFactor when setting card
  fixedArtShapeSize (LP: #1599238)
* Remove unused LimitProxyModel
* Do not calculate implicitHeight for Cards in a CardGrid
* Small clazy fixes
[ Daniel d'Andrada ]
* Remove stage property from Application
[ Larry Price ]
* Allow libertine-scope to show empty search result hint unmodified.
  (LP: #1606693)
[ Lukáš Tinkl ]
* Open the quicklist (context) menu also using the Menu key (LP:
  #1608265)
* Fix incorrect SIM PIN dialog position when entering a wrong PIN (LP:
  #1596076)
* Apply the correct keymap also on prompt surfaces (LP: #1610124)
* Implement an optional system update feature during OOBE wizard (LP:
  #1580785)
* Implement a page for choosing HW keyboard layout in OOBE wizard
[ Michael Zanetti ]
* Clean up some build script legacy
* Add a crossbuilder_post file to make crossbuilder restart unity8
  after deploying
* fixes for the automatic switching between usage modes (LP: #1590944)
[ Omer Akram ]
* Add object names for setup wizard
[ Albert Astals Cid ]
* Fix DisabledScreenNotice::test_rotation
* Make the delegate of DashNavigationList an async Loader
* unity-scope-tool: Use parse instead of process
* VerticalJournal improvements regarding model insertions and item
  height changes (LP: #1599754)
* Add math.h includes for compilation in yakkety (LP: #1605502)
[ Andrea Cimitan ]
* Unfocus the search text field in the dash page header when requested
  (LP: #1590820)
* Use binding for filter popover contentWidth (LP: #1595116)
* Add few sourceSize for Image we forgot (LP: #1595113)
* Replace Flickable with an Item inside DashPageHeader for
  headerContainer (LP: #1599235)
[ Albert Astals Cid, Andrea Cimitan ]
* Unbox the artshapeLoader
[ Daniel d'Andrada ]
* Fix splashscreen orientation when app rotates own contents (LP:
  #1586050)
* tst_PreviewIconActions: Make test name match filename
* Cursor: make its size grid unit based (LP: #1604014)
* TouchEventSequenceWrapper: item might get deleted when touch
  sequence is committed (LP: #1607686)
[ Lukáš Tinkl ]
* Implement frontend support for running keyboard indicator
* Provide window/surface close shortcuts across all the stages (LP:
  #1578392, #1606528)
* Restart the location trust prompt service when exiting the wizard
  (LP: #1594430)
* Implement clearing the search and closing the panel on pressing
  Escape key in the dash header
* Fix log timestamps (LP: #1602196)
* Don't display the mode switch warning dialog on tablets (LP:
  #1600290)
[ Michael Terry ]
* Fix indicator profile bug that caused sound indicator to say Mute
  instead of Silent Mode. (LP: #1604205)
* Fix lockscreen appearing right after unlocking a locked session on
  the desktop. (LP: #1604374)
[ Michał Sawicz ]
* Add arm64 support, drop unnecessary B-D on web plugin

2555. By dobey

Merged dandrader's branch.

2554. By dobey

[ Zoltán Balogh ]
* Bump the version to secure UITK compatibility
[ Albert Astals Cid ]
* Pass the correct number of arguments to mapToItem (LP: #1606835)
* Rebuild against Qt 5.6.
* Add https://code.launchpad.net/~aacid/unity8/floor_includes/+merge/300850

2553. By dobey

tryCompare is apparently inconsistent with Compare.

2552. By dobey

Update copyright years in chagned files.
Do a second findChild in the test.

2551. By dobey

Use findChild instead.

2550. By dobey

[ Daniel d'Andrada ]
Make use of MirSurface::inputBounds and drop UbuntuKeyboardInfo hack

2549. By dobey

Processing doesn't call root triggered signal.

2548. By dobey

Update the tests too.

2547. By dobey

The whitespace test is awful.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2016-07-14 07:09:00 +0000
3+++ CMakeLists.txt 2016-08-08 16:52:11 +0000
4@@ -57,7 +57,7 @@
5 find_package(Qt5Concurrent 5.4 REQUIRED)
6 find_package(Qt5Sql 5.4 REQUIRED)
7
8-pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=19)
9+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=20)
10 pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)
11 pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
12 pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
13
14=== modified file 'debian/control'
15--- debian/control 2016-08-03 15:53:00 +0000
16+++ debian/control 2016-08-08 16:52:11 +0000
17@@ -11,9 +11,9 @@
18 # to g++ so we don't try to run arm g++
19 # on an x86 CPU for example, when cross-compiling.
20 g++:native,
21- libandroid-properties-dev,
22 graphviz,
23 gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
24+ libandroid-properties-dev,
25 libconnectivity-qt1-dev (>= 0.7.1),
26 libevdev-dev,
27 libgeonames-dev (>= 0.2),
28@@ -31,10 +31,12 @@
29 libqt5svg5-dev,
30 libqt5xmlpatterns5-dev,
31 libsystemsettings-dev,
32+ libubuntu-download-manager-common-dev,
33 libubuntugestures5-dev (>= 1.3.2030),
34 libubuntugestures5-private-dev (>= 1.3.2030),
35 libudev-dev,
36- libunity-api-dev (>= 7.116),
37+ libudm-common-dev,
38+ libunity-api-dev (>= 7.117),
39 libusermetricsoutput1-dev,
40 # Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
41 libx11-dev[!arm64 !armhf],
42@@ -152,7 +154,7 @@
43 qtdeclarative5-ubuntu-settings-components (>= 0.7),
44 qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
45 ubuntu-thumbnailer-impl-0,
46- unity-application-impl-19,
47+ unity-application-impl-20,
48 unity-notifications-impl-3,
49 unity-plugin-scopes | unity-scopes-impl,
50 unity-scopes-impl-12,
51@@ -198,7 +200,7 @@
52 Depends: ${misc:Depends},
53 ${shlibs:Depends},
54 Provides: unity-application-impl,
55- unity-application-impl-19,
56+ unity-application-impl-20,
57 Replaces: unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1)
58 Description: Fake environment for running Unity 8 shell
59 Provides fake implementations of some QML modules used by Unity 8 shell
60
61=== modified file 'plugins/Ubuntu/DownloadDaemonListener/CMakeLists.txt'
62--- plugins/Ubuntu/DownloadDaemonListener/CMakeLists.txt 2016-06-02 09:32:33 +0000
63+++ plugins/Ubuntu/DownloadDaemonListener/CMakeLists.txt 2016-08-08 16:52:11 +0000
64@@ -12,5 +12,7 @@
65 add_library(DownloadDaemonListener MODULE ${DOWNLOADDAEMONLISTENER_SOURCES})
66
67 qt5_use_modules(DownloadDaemonListener Qml Quick DBus Core)
68-
69+pkg_check_modules(DDLADAPTER REQUIRED udm-common)
70+add_definitions(${DDLADAPTER_CFLAGS} ${DDLADAPTER_CFLAGS_OTHER})
71+target_link_libraries(DownloadDaemonListener ${DDLADAPTER_LIBRARIES})
72 add_unity8_plugin(Ubuntu.DownloadDaemonListener 0.1 Ubuntu/DownloadDaemonListener TARGETS DownloadDaemonListener)
73
74=== modified file 'plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.cpp'
75--- plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.cpp 2015-08-19 13:56:21 +0000
76+++ plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.cpp 2016-08-08 16:52:11 +0000
77@@ -1,5 +1,5 @@
78 /*
79- * Copyright (C) 2013 - Canonical Ltd.
80+ * Copyright (C) 2013-2016 Canonical Ltd.
81 *
82 * This program is free software: you can redistribute it and/or modify it
83 * under the terms of the GNU Lesser General Public License, as
84@@ -78,6 +78,7 @@
85 connect(m_adaptor, static_cast<void (DownloadTrackerAdaptor::*)(qulonglong, qulonglong)>(&DownloadTrackerAdaptor::progress), this, &DownloadTracker::progress);
86 connect(m_adaptor, &DownloadTrackerAdaptor::resumed, this, &DownloadTracker::resumed);
87 connect(m_adaptor, &DownloadTrackerAdaptor::started, this, &DownloadTracker::started);
88+ connect(m_adaptor, &DownloadTrackerAdaptor::processing, this, &DownloadTracker::processing);
89 }
90 // FIXME find a better way of determining if the service is ready
91 Q_EMIT serviceReadyChanged(m_adaptor && m_adaptor->isValid());
92
93=== modified file 'plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.h'
94--- plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.h 2015-11-20 15:01:39 +0000
95+++ plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.h 2016-08-08 16:52:11 +0000
96@@ -1,5 +1,5 @@
97 /*
98- * Copyright (C) 2013 - Canonical Ltd.
99+ * Copyright (C) 2013-2016 Canonical Ltd.
100 *
101 * This program is free software: you can redistribute it and/or modify it
102 * under the terms of the GNU Lesser General Public License, as
103@@ -54,6 +54,7 @@
104 void error(const QString &error);
105 void finished(const QString &path);
106 void paused(bool success);
107+ void processing(const QString &path);
108 void progress(qulonglong received, qulonglong total);
109 void resumed(bool success);
110 void started(bool success);
111
112=== modified file 'plugins/Ubuntu/DownloadDaemonListener/interface/downloadtrackeradaptor.cpp'
113--- plugins/Ubuntu/DownloadDaemonListener/interface/downloadtrackeradaptor.cpp 2013-07-24 14:18:23 +0000
114+++ plugins/Ubuntu/DownloadDaemonListener/interface/downloadtrackeradaptor.cpp 2016-08-08 16:52:11 +0000
115@@ -1,8 +1,8 @@
116 /*
117 * This file was generated by qdbusxml2cpp version 0.8
118- * Command line was: qdbusxml2cpp -v -c DownloadTrackerAdaptor -p downloadtrackeradaptor.h:downloadtrackeradaptor.cpp -i metatypes.h com.canonical.applications.download.xml
119+ * Command line was: qdbusxml2cpp -v -c DownloadTrackerAdaptor -p downloadtrackeradaptor.h:downloadtrackeradaptor.cpp -i metatypes.h ../../../../../../ubuntu-download-manager/trunk/docs/dbus/com.canonical.applications.download.xml
120 *
121- * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
122+ * qdbusxml2cpp is Copyright (C) 2015 The Qt Company Ltd.
123 *
124 * This is an auto-generated file.
125 * This file may have been hand-edited. Look for HAND-EDIT comments
126
127=== modified file 'plugins/Ubuntu/DownloadDaemonListener/interface/downloadtrackeradaptor.h'
128--- plugins/Ubuntu/DownloadDaemonListener/interface/downloadtrackeradaptor.h 2015-09-14 09:11:08 +0000
129+++ plugins/Ubuntu/DownloadDaemonListener/interface/downloadtrackeradaptor.h 2016-08-08 16:52:11 +0000
130@@ -1,15 +1,15 @@
131 /*
132 * This file was generated by qdbusxml2cpp version 0.8
133- * Command line was: qdbusxml2cpp -v -c DownloadTrackerAdaptor -p downloadtrackeradaptor.h:downloadtrackeradaptor.cpp -i metatypes.h com.canonical.applications.download.xml
134+ * Command line was: qdbusxml2cpp -v -c DownloadTrackerAdaptor -p downloadtrackeradaptor.h:downloadtrackeradaptor.cpp -i metatypes.h ../../../../../../ubuntu-download-manager/trunk/docs/dbus/com.canonical.applications.download.xml
135 *
136- * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
137+ * qdbusxml2cpp is Copyright (C) 2015 The Qt Company Ltd.
138 *
139 * This is an auto-generated file.
140 * Do not edit! All changes made to it will be lost.
141 */
142
143-#ifndef DOWNLOADTRACKERADAPTOR_H_1374434371
144-#define DOWNLOADTRACKERADAPTOR_H_1374434371
145+#ifndef DOWNLOADTRACKERADAPTOR_H
146+#define DOWNLOADTRACKERADAPTOR_H
147
148 #include <QtCore/QObject>
149 #include <QtCore/QByteArray>
150@@ -36,6 +36,22 @@
151
152 ~DownloadTrackerAdaptor();
153
154+ Q_PROPERTY(QString ClickPackage READ clickPackage)
155+ inline QString clickPackage() const
156+ { return qvariant_cast< QString >(property("ClickPackage")); }
157+
158+ Q_PROPERTY(QString DestinationApp READ destinationApp)
159+ inline QString destinationApp() const
160+ { return qvariant_cast< QString >(property("DestinationApp")); }
161+
162+ Q_PROPERTY(bool ShowInIndicator READ showInIndicator)
163+ inline bool showInIndicator() const
164+ { return qvariant_cast< bool >(property("ShowInIndicator")); }
165+
166+ Q_PROPERTY(QString Title READ title)
167+ inline QString title() const
168+ { return qvariant_cast< QString >(property("Title")); }
169+
170 public Q_SLOTS: // METHODS
171 inline QDBusPendingReply<> allowGSMDownload(bool allowed)
172 {
173@@ -50,6 +66,24 @@
174 return asyncCallWithArgumentList(QStringLiteral("cancel"), argumentList);
175 }
176
177+ inline QDBusPendingReply<> collected()
178+ {
179+ QList<QVariant> argumentList;
180+ return asyncCallWithArgumentList(QStringLiteral("collected"), argumentList);
181+ }
182+
183+ inline QDBusPendingReply<QString> filePath()
184+ {
185+ QList<QVariant> argumentList;
186+ return asyncCallWithArgumentList(QStringLiteral("filePath"), argumentList);
187+ }
188+
189+ inline QDBusPendingReply<StringMap> headers()
190+ {
191+ QList<QVariant> argumentList;
192+ return asyncCallWithArgumentList(QStringLiteral("headers"), argumentList);
193+ }
194+
195 inline QDBusPendingReply<bool> isGSMDownloadAllowed()
196 {
197 QList<QVariant> argumentList;
198@@ -80,6 +114,27 @@
199 return asyncCallWithArgumentList(QStringLiteral("resume"), argumentList);
200 }
201
202+ inline QDBusPendingReply<> setDestinationDir(const QString &path)
203+ {
204+ QList<QVariant> argumentList;
205+ argumentList << QVariant::fromValue(path);
206+ return asyncCallWithArgumentList(QStringLiteral("setDestinationDir"), argumentList);
207+ }
208+
209+ inline QDBusPendingReply<> setHeaders(StringMap headers)
210+ {
211+ QList<QVariant> argumentList;
212+ argumentList << QVariant::fromValue(headers);
213+ return asyncCallWithArgumentList(QStringLiteral("setHeaders"), argumentList);
214+ }
215+
216+ inline QDBusPendingReply<> setMetadata(const QVariantMap &data)
217+ {
218+ QList<QVariant> argumentList;
219+ argumentList << QVariant::fromValue(data);
220+ return asyncCallWithArgumentList(QStringLiteral("setMetadata"), argumentList);
221+ }
222+
223 inline QDBusPendingReply<> setThrottle(qulonglong speed)
224 {
225 QList<QVariant> argumentList;
226@@ -93,6 +148,12 @@
227 return asyncCallWithArgumentList(QStringLiteral("start"), argumentList);
228 }
229
230+ inline QDBusPendingReply<int> state()
231+ {
232+ QList<QVariant> argumentList;
233+ return asyncCallWithArgumentList(QStringLiteral("state"), argumentList);
234+ }
235+
236 inline QDBusPendingReply<qulonglong> throttle()
237 {
238 QList<QVariant> argumentList;
239@@ -106,10 +167,16 @@
240 }
241
242 Q_SIGNALS: // SIGNALS
243+ void authError(AuthErrorStruct error);
244 void canceled(bool success);
245 void error(const QString &error);
246 void finished(const QString &path);
247+ void hashError(HashErrorStruct error);
248+ void httpError(HttpErrorStruct error);
249+ void networkError(NetworkErrorStruct error);
250 void paused(bool success);
251+ void processError(ProcessErrorStruct error);
252+ void processing(const QString &path);
253 void progress(qulonglong received, qulonglong total);
254 void resumed(bool success);
255 void started(bool success);
256
257=== modified file 'plugins/Ubuntu/DownloadDaemonListener/interface/metatypes.h'
258--- plugins/Ubuntu/DownloadDaemonListener/interface/metatypes.h 2013-07-24 14:18:23 +0000
259+++ plugins/Ubuntu/DownloadDaemonListener/interface/metatypes.h 2016-08-08 16:52:11 +0000
260@@ -1,5 +1,5 @@
261 /*
262- * Copyright 2013 2013 Canonical Ltd.
263+ * Copyright 2013-2016 Canonical Ltd.
264 *
265 * This library is free software; you can redistribute it and/or
266 * modify it under the terms of version 3 of the GNU Lesser General Public
267@@ -19,10 +19,7 @@
268 #ifndef DOWNLOADER_LIB_APP_METATYPES_H
269 #define DOWNLOADER_LIB_APP_METATYPES_H
270
271-#include <QMap>
272-
273-typedef QMap<QString, QString> StringMap;
274-
275-Q_DECLARE_METATYPE(StringMap)
276+// Just include the system file so we're always up to date.
277+#include <ubuntu/download_manager/metatypes.h>
278
279 #endif // METATYPES_H
280
281=== modified file 'qml/Dash/Previews/PreviewProgress.qml'
282--- qml/Dash/Previews/PreviewProgress.qml 2015-07-15 15:07:19 +0000
283+++ qml/Dash/Previews/PreviewProgress.qml 2016-08-08 16:52:11 +0000
284@@ -1,5 +1,5 @@
285 /*
286- * Copyright (C) 2014 Canonical, Ltd.
287+ * Copyright (C) 2014-2016 Canonical, Ltd.
288 *
289 * This program is free software; you can redistribute it and/or modify
290 * it under the terms of the GNU General Public License as published by
291@@ -59,6 +59,10 @@
292 }
293 }
294
295+ onProcessing: {
296+ progressBar.indeterminate = true;
297+ }
298+
299 onFinished: {
300 root.triggered(widgetId, "finished", widgetData)
301 }
302
303=== modified file 'qml/Stages/TabletStage.qml'
304--- qml/Stages/TabletStage.qml 2016-07-12 09:43:50 +0000
305+++ qml/Stages/TabletStage.qml 2016-08-08 16:52:11 +0000
306@@ -542,7 +542,7 @@
307 if (!app) {
308 return index;
309 }
310- var stage = spreadRepeater.itemAt(index) ? spreadRepeater.itemAt(index).stage : app.stage;
311+ var stage = spreadRepeater.itemAt(index) ? spreadRepeater.itemAt(index).stage : ApplicationInfoInterface.MainStage;
312
313 // don't shuffle indexes greater than "actives or next"
314 if (index > 2) return index;
315
316=== modified file 'tests/mocks/Ubuntu/DownloadDaemonListener/MockDownloadTracker.cpp'
317--- tests/mocks/Ubuntu/DownloadDaemonListener/MockDownloadTracker.cpp 2013-09-25 19:58:58 +0000
318+++ tests/mocks/Ubuntu/DownloadDaemonListener/MockDownloadTracker.cpp 2016-08-08 16:52:11 +0000
319@@ -1,5 +1,5 @@
320 /*
321- * Copyright (C) 2013 - Canonical Ltd.
322+ * Copyright (C) 2013-2016 Canonical Ltd.
323 *
324 * This program is free software: you can redistribute it and/or modify it
325 * under the terms of the GNU Lesser General Public License, as
326@@ -67,6 +67,8 @@
327 Q_EMIT finished("downloadComplete");
328 }else if(m_dbusPath == "error") {
329 Q_EMIT error("DOWNLOAD ERROR");
330+ }else if(m_dbusPath == "processing") {
331+ Q_EMIT processing(m_dbusPath);
332 }
333 }
334 }
335
336=== modified file 'tests/mocks/Ubuntu/DownloadDaemonListener/MockDownloadTracker.h'
337--- tests/mocks/Ubuntu/DownloadDaemonListener/MockDownloadTracker.h 2013-08-13 08:50:50 +0000
338+++ tests/mocks/Ubuntu/DownloadDaemonListener/MockDownloadTracker.h 2016-08-08 16:52:11 +0000
339@@ -1,5 +1,5 @@
340 /*
341- * Copyright (C) 2013 - Canonical Ltd.
342+ * Copyright (C) 2013-2016 Canonical Ltd.
343 *
344 * This program is free software: you can redistribute it and/or modify it
345 * under the terms of the GNU Lesser General Public License, as
346@@ -51,6 +51,7 @@
347 void error(const QString &error);
348 void finished(const QString &path);
349 void paused(bool success);
350+ void processing(const QString &path);
351 void progress(qulonglong received, qulonglong total);
352 void resumed(bool success);
353 void started(bool success);
354
355=== modified file 'tests/mocks/Unity/Application/ApplicationInfo.cpp'
356--- tests/mocks/Unity/Application/ApplicationInfo.cpp 2016-06-06 14:13:05 +0000
357+++ tests/mocks/Unity/Application/ApplicationInfo.cpp 2016-08-08 16:52:11 +0000
358@@ -175,14 +175,6 @@
359 }
360 }
361
362-void ApplicationInfo::setStage(Stage value)
363-{
364- if (value != m_stage) {
365- m_stage = value;
366- Q_EMIT stageChanged(value);
367- }
368-}
369-
370 void ApplicationInfo::setState(State value)
371 {
372 if (value != m_state) {
373
374=== modified file 'tests/mocks/Unity/Application/ApplicationInfo.h'
375--- tests/mocks/Unity/Application/ApplicationInfo.h 2016-06-03 11:11:34 +0000
376+++ tests/mocks/Unity/Application/ApplicationInfo.h 2016-08-08 16:52:11 +0000
377@@ -67,9 +67,6 @@
378
379 QUrl icon() const override { return m_icon; }
380
381- Q_INVOKABLE void setStage(Stage value) override; // invokable only for mock
382- Stage stage() const override { return m_stage; }
383-
384 Q_INVOKABLE void setState(State value);
385 State state() const override { return m_state; }
386
387@@ -137,7 +134,6 @@
388 QString m_appId;
389 QString m_name;
390 QUrl m_icon;
391- Stage m_stage{MainStage};
392 State m_state{Stopped};
393 bool m_fullscreen{false};
394 Qt::ScreenOrientations m_supportedOrientations{Qt::PortraitOrientation |
395
396=== modified file 'tests/mocks/Unity/Application/ApplicationManager.cpp'
397--- tests/mocks/Unity/Application/ApplicationManager.cpp 2016-06-20 11:53:35 +0000
398+++ tests/mocks/Unity/Application/ApplicationManager.cpp 2016-08-08 16:52:11 +0000
399@@ -102,8 +102,6 @@
400 return app->comment();
401 case RoleIcon:
402 return app->icon();
403- case RoleStage:
404- return app->stage();
405 case RoleState:
406 return app->state();
407 case RoleFocused:
408@@ -166,11 +164,6 @@
409 if (!appIndex.isValid()) return;
410 Q_EMIT dataChanged(appIndex, appIndex, QVector<int>() << ApplicationManager::RoleState);
411 });
412- connect(application, &ApplicationInfo::stageChanged, this, [application, this]() {
413- QModelIndex appIndex = findIndex(application);
414- if (!appIndex.isValid()) return;
415- Q_EMIT dataChanged(appIndex, appIndex, QVector<int>() << ApplicationManager::RoleStage);
416- });
417
418 connect(application, &ApplicationInfo::closed, this, [application, this]() {
419 this->remove(application);
420@@ -344,7 +337,6 @@
421 application->setScreenshotId("gallery");
422 application->setIconId("gallery");
423 application->setShellChrome(Mir::LowChrome);
424- application->setStage(ApplicationInfo::MainStage);
425 m_availableApplications.append(application);
426
427 application = new ApplicationInfo(this);
428@@ -381,7 +373,6 @@
429 application->setName("GMail");
430 application->setIconId("gmail");
431 application->setScreenshotId("gmail-webapp.svg");
432- application->setStage(ApplicationInfo::MainStage);
433 application->setSupportedOrientations(Qt::PortraitOrientation
434 | Qt::LandscapeOrientation
435 | Qt::InvertedPortraitOrientation
436@@ -393,7 +384,6 @@
437 application->setName("Music");
438 application->setIconId("soundcloud");
439 application->setScreenshotId("music");
440- application->setStage(ApplicationInfo::MainStage);
441 application->setSupportedOrientations(Qt::PortraitOrientation
442 | Qt::LandscapeOrientation
443 | Qt::InvertedPortraitOrientation
444
445=== modified file 'tests/plugins/Unity/Launcher/launchermodeltest.cpp'
446--- tests/plugins/Unity/Launcher/launchermodeltest.cpp 2016-07-07 16:18:59 +0000
447+++ tests/plugins/Unity/Launcher/launchermodeltest.cpp 2016-08-08 16:52:11 +0000
448@@ -49,8 +49,6 @@
449 QString name() const override { return "mock"; }
450 QString comment() const override { return "this is a mock"; }
451 QUrl icon() const override { return QUrl(); }
452- ApplicationInfoInterface::Stage stage() const override { return ApplicationInfoInterface::MainStage; }
453- void setStage(ApplicationInfoInterface::Stage) override {}
454 ApplicationInfoInterface::State state() const override { return ApplicationInfoInterface::Running; }
455 bool focused() const override { return m_focused; }
456 QString splashTitle() const override { return QString(); }
457
458=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewProgress.qml'
459--- tests/qmltests/Dash/Previews/tst_PreviewProgress.qml 2015-07-15 15:07:19 +0000
460+++ tests/qmltests/Dash/Previews/tst_PreviewProgress.qml 2016-08-08 16:52:11 +0000
461@@ -1,5 +1,5 @@
462 /*
463- * Copyright 2014 Canonical Ltd.
464+ * Copyright 2014-2016 Canonical Ltd.
465 *
466 * This program is free software; you can redistribute it and/or modify
467 * it under the terms of the GNU General Public License as published by
468@@ -40,6 +40,11 @@
469 "source": { "dbus-name" : "somename", "dbus-object": "error" }
470 }
471
472+ property var progressjsonProcessing: {
473+ "type": "progress",
474+ "source": { "dbus-name" : "somename", "dbus-object": "processing" }
475+ }
476+
477 SignalSpy {
478 id: spy
479 signalName: "triggered"
480@@ -82,6 +87,14 @@
481 compare(args[0], "previewProgress");
482 compare(args[1], "failed");
483 compare(args[2], progressjsonError);
484+
485+ spy.clear();
486+
487+ var progressBar = findChild(previewProgress, "progressBar");
488+ compare(progressBar.indeterminate, false);
489+ previewProgress.widgetData = progressjsonProcessing;
490+ progressBar = findChild(previewProgress, "progressBar");
491+ tryCompare(progressBar, "indeterminate", true);
492 }
493 }
494 }
495
496=== modified file 'tests/qmltests/Stages/tst_TabletStage.qml'
497--- tests/qmltests/Stages/tst_TabletStage.qml 2016-06-22 13:42:30 +0000
498+++ tests/qmltests/Stages/tst_TabletStage.qml 2016-08-08 16:52:11 +0000
499@@ -290,8 +290,9 @@
500 var webbrowserSurfaceId = topSurfaceList.nextId;
501 webbrowserCheckBox.checked = true;
502 waitUntilAppSurfaceShowsUp(webbrowserSurfaceId);
503- var webbrowserApp = ApplicationManager.findApplication(webbrowserCheckBox.appId);
504- compare(webbrowserApp.stage, ApplicationInfoInterface.MainStage);
505+ var webbrowserDelegate = findChild(tabletStage, "spreadDelegate_" + webbrowserSurfaceId);
506+ verify(webbrowserDelegate);
507+ compare(webbrowserDelegate.stage, ApplicationInfoInterface.MainStage);
508 var webbrowserWindow = findAppWindowForSurfaceId(webbrowserSurfaceId);
509 verify(webbrowserWindow);
510
511@@ -397,8 +398,10 @@
512 var webbrowserSurfaceId = topSurfaceList.nextId;
513 webbrowserCheckBox.checked = true;
514 waitUntilAppSurfaceShowsUp(webbrowserSurfaceId);
515+ var webbrowserDelegate = findChild(tabletStage, "spreadDelegate_" + webbrowserSurfaceId);
516+ verify(webbrowserDelegate);
517+ compare(webbrowserDelegate.stage, ApplicationInfoInterface.MainStage);
518 var webbrowserApp = ApplicationManager.findApplication(webbrowserCheckBox.appId);
519- compare(webbrowserApp.stage, ApplicationInfoInterface.MainStage);
520
521 var gallerySurfaceId = topSurfaceList.nextId;
522 galleryCheckBox.checked = true;
523
524=== modified file 'tests/qmltests/tst_OrientedShell.qml'
525--- tests/qmltests/tst_OrientedShell.qml 2016-07-29 20:25:09 +0000
526+++ tests/qmltests/tst_OrientedShell.qml 2016-08-08 16:52:11 +0000
527@@ -515,7 +515,6 @@
528 compare(primaryDelegate.focus, true);
529 compare(primaryApp.rotatesWindowContents, false);
530 compare(primaryApp.supportedOrientations, Qt.PrimaryOrientation);
531- compare(primaryApp.stage, ApplicationInfoInterface.MainStage);
532
533 tryCompareFunction(function(){return primaryDelegate.surface != null;}, true);
534 verify(checkAppSurfaceOrientation(primaryAppWindow, primaryApp, root.primaryOrientationAngle));
535@@ -559,7 +558,8 @@
536 compare(ApplicationManager.focusedApplicationId, "primary-oriented-app");
537 compare(primaryApp.rotatesWindowContents, false);
538 compare(primaryApp.supportedOrientations, Qt.PrimaryOrientation);
539- compare(primaryApp.stage, ApplicationInfoInterface.MainStage);
540+ var primaryDelegate = findChild(shell, "spreadDelegate_" + primarySurfaceId);
541+ compare(primaryDelegate.stage, ApplicationInfoInterface.MainStage);
542
543 tryCompareFunction(function(){return primaryApp.surfaceList.count > 0;}, true);
544
545@@ -599,7 +599,6 @@
546 compare(gmailApp.rotatesWindowContents, false);
547 compare(gmailApp.supportedOrientations, Qt.PortraitOrientation | Qt.LandscapeOrientation
548 | Qt.InvertedPortraitOrientation | Qt.InvertedLandscapeOrientation);
549- compare(gmailApp.stage, ApplicationInfoInterface.MainStage);
550
551 // wait until it's able to rotate
552 tryCompare(shell, "orientationChangesEnabled", true);
553@@ -724,7 +723,6 @@
554 compare(gmailApp.rotatesWindowContents, false);
555 compare(gmailApp.supportedOrientations, Qt.PortraitOrientation | Qt.LandscapeOrientation
556 | Qt.InvertedPortraitOrientation | Qt.InvertedLandscapeOrientation);
557- compare(gmailApp.stage, ApplicationInfoInterface.MainStage);
558
559 waitUntilAppWindowIsFullyLoaded(gmailSurfaceId);
560
561@@ -736,7 +734,10 @@
562 compare(musicApp.rotatesWindowContents, false);
563 compare(musicApp.supportedOrientations, Qt.PortraitOrientation | Qt.LandscapeOrientation
564 | Qt.InvertedPortraitOrientation | Qt.InvertedLandscapeOrientation);
565- compare(musicApp.stage, ApplicationInfoInterface.MainStage);
566+ if (data.deviceName === "manta" || data.deviceName === "flo") {
567+ var musicDelegate = findChild(shell, "spreadDelegate_" + musicSurfaceId);
568+ compare(musicDelegate.stage, ApplicationInfoInterface.MainStage);
569+ }
570
571 waitUntilAppWindowIsFullyLoaded(musicSurfaceId);
572 tryCompare(shell, "orientationChangesEnabled", true);
573@@ -889,6 +890,7 @@
574 ];
575 }
576 function test_appInSideStageDoesntRotateOnStartUp(data) {
577+ WindowStateStorage.saveStage("twitter-webapp", ApplicationInfoInterface.SideStage)
578 loadShell(data.deviceName);
579
580 var twitterDelegate = null;
581@@ -905,9 +907,11 @@
582 signalSpy.target = null;
583 signalSpy.signalName = "runningChanged";
584
585+ var twitterSurfaceId = topLevelSurfaceList.nextId;
586 var twitterApp = ApplicationManager.startApplication("twitter-webapp");
587 verify(twitterApp);
588- twitterApp.stage = ApplicationInfoInterface.SideStage;
589+ var twitterDelegate = findChild(shell, "spreadDelegate_" + twitterSurfaceId);
590+ compare(twitterDelegate.stage, ApplicationInfoInterface.SideStage);
591
592 // ensure the mock twitter-webapp is as we expect
593 compare(twitterApp.rotatesWindowContents, false);
594
595=== modified file 'tests/qmltests/tst_Shell.qml'
596--- tests/qmltests/tst_Shell.qml 2016-08-03 15:53:36 +0000
597+++ tests/qmltests/tst_Shell.qml 2016-08-08 16:52:11 +0000
598@@ -2103,8 +2103,13 @@
599 waitUntilAppWindowIsFullyLoaded(app2SurfaceId);
600
601 // Sanity checking
602- compare(app1.stage, ApplicationInfoInterface.MainStage);
603- compare(app2.stage, ApplicationInfoInterface.MainStage);
604+ if (data.usageScenario === "tablet") {
605+ var app1Delegate = findChild(shell, "spreadDelegate_" + app1SurfaceId);
606+ compare(app1Delegate.stage, ApplicationInfoInterface.MainStage);
607+
608+ var app2Delegate = findChild(shell, "spreadDelegate_" + app2SurfaceId);
609+ compare(app2Delegate.stage, ApplicationInfoInterface.MainStage);
610+ }
611 verify(!app1.isTouchApp);
612
613 var app1Surface = app1.surfaceList.get(0);
614@@ -2139,8 +2144,13 @@
615 waitUntilAppWindowIsFullyLoaded(app2SurfaceId);
616
617 // Sanity checking
618- compare(app1.stage, ApplicationInfoInterface.MainStage);
619- compare(app2.stage, ApplicationInfoInterface.MainStage);
620+ if (data.usageScenario === "tablet") {
621+ var app1Delegate = findChild(shell, "spreadDelegate_" + app1SurfaceId);
622+ compare(app1Delegate.stage, ApplicationInfoInterface.MainStage);
623+
624+ var app2Delegate = findChild(shell, "spreadDelegate_" + app2SurfaceId);
625+ compare(app2Delegate.stage, ApplicationInfoInterface.MainStage);
626+ }
627
628 var app1Surface = app1.surfaceList.get(0);
629 verify(app1Surface);

Subscribers

People subscribed via source and target branches