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-01-15 09:16:05 +0000
4
@@ -1,5 +1,5 @@
5
1
/*
1
/*
7
2
 * Copyright 2012 Canonical Ltd.
2
 * Copyright 2011 Canonical Ltd.
8
3
 *
3
 *
9
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
10
5
 * it under the terms of the GNU Lesser General Public License as published by
5
 * it under the terms of the GNU Lesser General Public License as published by
11
@@ -29,6 +29,7 @@
12
29
         absButton.clicked()
29
         absButton.clicked()
13
30
         compare(action1.triggerCount, numTriggers+1, "Button clicked triggers action")
30
         compare(action1.triggerCount, numTriggers+1, "Button clicked triggers action")
14
31
         absButton.action = null
31
         absButton.action = null
15
32
         verify(false)
16
32
     }
33
     }
17
33
34
18
34
     function test_hovered() {
35
     function test_hovered() {
19
35
36
20
=== modified file 'ubuntu-sdk.pro'
21
--- ubuntu-sdk.pro	2016-01-14 15:24:59 +0000
22
+++ ubuntu-sdk.pro	2016-01-15 09:16:05 +0000
23
@@ -1,8 +1,8 @@
24
1
#include( documentation/documentation.pri )
1
#include( documentation/documentation.pri )
26
2
              
2
             
27
3
BUILD_PATH_CONTENTS="SRC_DIR=\"$$PWD\"" \
3
BUILD_PATH_CONTENTS="SRC_DIR=\"$$PWD\"" \
28
4
                    "BUILD_DIR=\"$$OUT_PWD\""
4
                    "BUILD_DIR=\"$$OUT_PWD\""
30
5
5
 
31
6
write_file($$PWD/build_paths.inc,BUILD_PATH_CONTENTS)
6
write_file($$PWD/build_paths.inc,BUILD_PATH_CONTENTS)
32
7
7
33
8
requires(qtHaveModule(quick))
8
requires(qtHaveModule(quick))
Status:	Work in progress
Proposed branch:	lp:~timo-jyrinki/ubuntu-ui-toolkit/test_jenkins_4_fail
Merge into:	lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/jenkins-test
Diff against target:	33 lines (+4/-3) 2 files modified tests/unit/tst_components/tst_abstractbutton.qml (+2/-1) ubuntu-sdk.pro (+2/-2)
To merge this branch:	bzr merge lp:~timo-jyrinki/ubuntu-ui-toolkit/test_jenkins_4_fail
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration		Needs Fixing on 2016-01-15
Ubuntu SDK team		2016-01-14	Pending
Review via email: mp+282577@code.launchpad.net