Merge lp:~timo-jyrinki/ubuntu-ui-toolkit/fofo into lp:ubuntu-ui-toolkit/staging

Proposed by Timo Jyrinki on 2016-01-19
Status: Work in progress
Proposed branch: lp:~timo-jyrinki/ubuntu-ui-toolkit/fofo
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 21 lines (+2/-1)
2 files modified
tests/unit/tst_components/tst_abstractbutton.qml (+1/-0)
ubuntu-sdk.pro (+1/-1)
To merge this branch: bzr merge lp:~timo-jyrinki/ubuntu-ui-toolkit/fofo
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve on 2016-04-18
Ubuntu SDK team 2016-01-19 Pending
Review via email: mp+283103@code.launchpad.net

Commit message

Test change, not for merging.

To post a comment you must log in.
review: Needs Fixing (continuous-integration)
1809. By Timo Jyrinki on 2016-01-20

bump

1810. By Timo Jyrinki on 2016-01-25

cause failure

review: Needs Fixing (continuous-integration)
1811. By Timo Jyrinki on 2016-01-25

Unbreak.

1812. By Timo Jyrinki on 2016-01-27

bump

review: Needs Fixing (continuous-integration)
review: Needs Fixing (continuous-integration)
review: Needs Fixing (continuous-integration)
review: Needs Fixing (continuous-integration)
review: Needs Fixing (continuous-integration)
1813. By Timo Jyrinki on 2016-02-03

bump

1814. By Timo Jyrinki on 2016-02-05

bump

1815. By Timo Jyrinki on 2016-02-05

bump

1816. By Timo Jyrinki on 2016-02-09

bump2

Unmerged revisions

1816. By Timo Jyrinki on 2016-02-09

bump2

1815. By Timo Jyrinki on 2016-02-05

bump

1814. By Timo Jyrinki on 2016-02-05

bump

1813. By Timo Jyrinki on 2016-02-03

bump

1812. By Timo Jyrinki on 2016-01-27

bump

1811. By Timo Jyrinki on 2016-01-25

Unbreak.

1810. By Timo Jyrinki on 2016-01-25

cause failure

1809. By Timo Jyrinki on 2016-01-20

bump

1808. By Timo Jyrinki on 2016-01-19

testchange

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/unit/tst_components/tst_abstractbutton.qml'
2--- tests/unit/tst_components/tst_abstractbutton.qml 2015-08-25 06:45:31 +0000
3+++ tests/unit/tst_components/tst_abstractbutton.qml 2016-02-09 07:17:20 +0000
4@@ -29,6 +29,7 @@
5 absButton.clicked()
6 compare(action1.triggerCount, numTriggers+1, "Button clicked triggers action")
7 absButton.action = null
8+ // verify(false)
9 }
10
11 function test_hovered() {
12
13=== modified file 'ubuntu-sdk.pro'
14--- ubuntu-sdk.pro 2015-12-11 13:35:10 +0000
15+++ ubuntu-sdk.pro 2016-02-09 07:17:20 +0000
16@@ -1,5 +1,5 @@
17 #include( documentation/documentation.pri )
18-
19+
20 BUILD_PATH_CONTENTS="SRC_DIR=\"$$PWD\"" \
21 "BUILD_DIR=\"$$OUT_PWD\""
22

Subscribers

People subscribed via source and target branches