1
=== modified file 'debian/control'
2
--- debian/control	2013-04-25 18:50:40 +0000
3
+++ debian/control	2013-05-07 10:21:28 +0000
4
@@ -11,6 +11,7 @@
5
11
               libboost1.49-dev (>= 1.49),
11
               libboost1.49-dev (>= 1.49),
6
12
               libdee-qt5-dev (>= 3.0),
12
               libdee-qt5-dev (>= 3.0),
7
13
               libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
13
               libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
8
14
               libgl1-mesa-dri,
9
14
               libgles2-mesa-dev[armhf],
15
               libgles2-mesa-dev[armhf],
10
15
               libgtest-dev,
16
               libgtest-dev,
11
16
               libhud-client2-dev,
17
               libhud-client2-dev,
12
17
18
13
=== modified file 'tests/qmltests/Dash/tst_PeoplePreview.qml'
14
--- tests/qmltests/Dash/tst_PeoplePreview.qml	2013-05-03 22:23:27 +0000
15
+++ tests/qmltests/Dash/tst_PeoplePreview.qml	2013-05-07 10:21:28 +0000
16
@@ -225,6 +225,7 @@
17
225
        }
225
        }
18
226
226
19
227
        function verifyClick(field) {
227
        function verifyClick(field) {
20
228
            waitForRendering(field)
21
228
            clickSpy.signalName = "" // Get rid of a warning if new target doesn't support previous signal name
229
            clickSpy.signalName = "" // Get rid of a warning if new target doesn't support previous signal name
22
229
            clickSpy.target = field;
230
            clickSpy.target = field;
23
230
            clickSpy.clear();
231
            clickSpy.clear();
24
@@ -235,6 +236,7 @@
25
235
        }
236
        }
26
236
237
27
237
        function verifyPhoneNumberClick(field) {
238
        function verifyPhoneNumberClick(field) {
28
239
            waitForRendering(field)
29
238
            clickSpy.target = field;
240
            clickSpy.target = field;
30
239
            clickSpy.clear();
241
            clickSpy.clear();
31
240
            clickSpy.signalName = "phoneClicked";
242
            clickSpy.signalName = "phoneClicked";
Status:	Merged
Approved by:	Albert Astals Cid on 2013-05-07
Approved revision:	no longer in the source branch.
Merged at revision:	659
Proposed branch:	lp:~aacid/unity/jenkins_mesa_dri
Merge into:	lp:unity/phablet
Diff against target:	31 lines (+3/-0) 2 files modified debian/control (+1/-0) tests/qmltests/Dash/tst_PeoplePreview.qml (+2/-0)
To merge this branch:	bzr merge lp:~aacid/unity/jenkins_mesa_dri
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-05-07
Ying-Chun Liu (community)			Approve on 2013-05-07
Gerry Boland (community)			Approve on 2013-05-07
Michael Zanetti (community)		2013-05-03	Approve on 2013-05-03
Review via email: mp+162377@code.launchpad.net