Merge lp://staging/~tpeeters/ubuntu-ui-toolkit/headerAnimate into lp://staging/ubuntu-ui-toolkit/staging

Proposed by Tim Peeters
Status: Merged
Approved by: Cris Dywan
Approved revision: 1846
Merged at revision: 1837
Proposed branch: lp://staging/~tpeeters/ubuntu-ui-toolkit/headerAnimate
Merge into: lp://staging/ubuntu-ui-toolkit/staging
Diff against target: 290 lines (+149/-17)
7 files modified
src/Ubuntu/Components/1.3/AppHeader.qml (+9/-5)
src/Ubuntu/Components/plugin/plugin.cpp (+4/-1)
src/Ubuntu/Components/plugin/plugin.pri (+4/-2)
src/Ubuntu/Components/plugin/privates/appheaderbase.cpp (+69/-0)
src/Ubuntu/Components/plugin/privates/appheaderbase.h (+54/-0)
src/Ubuntu/Components/plugin/ucheader.cpp (+7/-7)
src/Ubuntu/Components/plugin/ucheader.h (+2/-2)
To merge this branch: bzr merge lp://staging/~tpeeters/ubuntu-ui-toolkit/headerAnimate
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve
Cris Dywan Approve
Review via email: mp+284264@code.staging.launchpad.net

Commit message

Add 'animate' property to new internal AppHeaderBase, and do not show a header animation when starting an app without header.

To post a comment you must log in.
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Tim Peeters (tpeeters) wrote :

To test the results of this MR:

mkdir fix1518002 && cd fix1518002 && wget https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/203/artifact/debs/artifacts/copy-to-phone-headerAnimate-1832.tar && tar -xf copy-to-phone-headerAnimate-1832.tar && sudo dpkg -i *.deb

and then re-run the apps to test them manually.

Revision history for this message
Tim Peeters (tpeeters) wrote :

After a discussion with Zsombor and Christian, I checked whether QQuickItem.componentComplete() is called before or after the Item's Component.onCompleted. Unfortunately, it is after so I cannot use that:

UCHeader.componentComplete()
qml: AppHeader.Component.onCompleted() start.
qml: AppHeader.Component.onCompleted() done.

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Cris Dywan (kalikiana) wrote :

Looks sensible.

J seems to have failed due to an error in the build script.

review: Approve
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-autolanding/123/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-land-mp/125/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Tim Peeters (tpeeters) wrote :
Download full text (3.7 KiB)

InverseMouseArea breaks on xenial?

tst_inversemousearea: Started with PID: 12219
tst_inversemousearea: ********* Start testing of tst_InverseMouseAreaTest *********
tst_inversemousearea: Config: Using QtTest library 5.4.1, Qt 5.4.1 (x86_64-little_endian-lp64 shared (dynamic) release build; by GCC 4.9.2)
tst_inversemousearea: PASS : tst_InverseMouseAreaTest::initTestCase()
tst_inversemousearea: PASS : tst_InverseMouseAreaTest::testCase_Defaults()
tst_inversemousearea: PASS : tst_InverseMouseAreaTest::testCase_DoNotPropagateEvents()
tst_inversemousearea: PASS : tst_InverseMouseAreaTest::testCase_PropagateEvents()
tst_inversemousearea: PASS : tst_InverseMouseAreaTest::testCase_sensingAreaError()
tst_inversemousearea: PASS : tst_InverseMouseAreaTest::testCase_InverseMouseAreInWindow()
tst_inversemousearea: PASS : tst_InverseMouseAreaTest::testCase_OverlappedMouseArea()
tst_inversemousearea: PASS : tst_InverseMouseAreaTest::testCase_InverseMouseAreaOnTop()
tst_inversemousearea: QWARN : tst_InverseMouseAreaTest::testCase_InverseMouseAreaOnTopNoAccept() file:///tmp/buildd/ubuntu-ui-toolkit-1.3.1795+16.04.20160106/tests/unit_x11/tst_inversemousearea/InverseMouseAreaOnTopNoAccept.qml:53:9: QML Button: Theme.createStyleComponent() is deprecated. Use ThemeSettings instead.
tst_inversemousearea: QWARN : tst_InverseMouseAreaTest::testCase_InverseMouseAreaOnTopNoAccept() file:///tmp/buildd/ubuntu-ui-toolkit-1.3.1795+16.04.20160106/tests/unit_x11/tst_inversemousearea/InverseMouseAreaOnTopNoAccept.qml:53:9: QML Button: Mixing of Ubuntu.Components module versions 1.2 and 1.3 detected!
tst_inversemousearea: PASS : tst_InverseMouseAreaTest::testCase_InverseMouseAreaOnTopNoAccept()
tst_inversemousearea: PASS : tst_InverseMouseAreaTest::testCase_InverseMouseAreaOnTopTopmost()
tst_inversemousearea: PASS : tst_InverseMouseAreaTest::testCase_InverseMouseAreaSignals()
tst_inversemousearea: PASS : tst_InverseMouseAreaTest::testCase_InverseMouseAreaNormalEventStack()
tst_inversemousearea: PASS : tst_InverseMouseAreaTest::testCase_InverseMouseAreaTopmost()
tst_inversemousearea: PASS : tst_InverseMouseAreaTest::testCase_InverseMouseAreaSensingArea()
tst_inversemousearea: PASS : tst_InverseMouseAreaTest::testCase_InverseMouseAreaSensingAreaChange()
tst_inversemousearea: QDEBUG : tst_InverseMouseAreaTest::test_MouseClicksOnHeaderNotSeen_bug1288876(InverseMouseArea in a Page) qml: Page.tools is a deprecated property. Please use Page.head instead.
tst_inversemousearea: PASS : tst_InverseMouseAreaTest::test_MouseClicksOnHeaderNotSeen_bug1288876(InverseMouseArea in a Page)
tst_inversemousearea: PASS : tst_InverseMouseAreaTest::test_MouseClicksOnHeaderNotSeen_bug1288876(InverseMouseArea with clip)
tst_inversemousearea: QDEBUG : tst_InverseMouseAreaTest::test_MouseClicksOnHeaderNotSeen_bug1288876(InverseMouseArea parent clipped) qml: Page.tools is a deprecated property. Please use Page.head instead.
tst_inversemousearea: PASS : tst_InverseMouseAreaTest::test_MouseClicksOnHeaderNotSeen_bug1288876(InverseMouseArea parent clipped)
tst_inversemousearea: PASS : tst_InverseMouseAreaTest::test_MouseClicksOnHeaderNotSeen_bug1288876(InverseMouseAr...

Read more...

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches