Unity 8

Merge lp:~aacid/unity8/qt56 into lp:unity8

qt56
Merge into trunk

Proposed by Albert Astals Cid on 2016-04-04

Status:

Merged

Approved by:

Michael Zanetti on 2016-04-06

Approved revision:

2327

Merged at revision:

2354

Proposed branch:

lp:~aacid/unity8/qt56

Merge into:

lp:unity8

Diff against target:

25 lines (+2/-2)

2 files modified

tests/libs/UbuntuGestures/tst_TouchRegistry.cpp (+1/-1)
tests/mocks/Unity/InputInfo/qinputdeviceinfo_mock.cpp (+1/-1)

To merge this branch:

bzr merge lp:~aacid/unity8/qt56

Critical

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Needs Fixing on 2016-04-20
Michael Zanetti (community)			Approve on 2016-04-06
Timo Jyrinki		2016-04-04	Approve on 2016-04-04
Review via email: mp+290854@code.launchpad.net

Commit Message

Compile with Qt 5.6

And actually emit the signal

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?
N/A

* Did you make sure that your branch does not contain spurious tags?
Yes

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

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

lp:~aacid/unity8/qt56 updated on 2016-04-04

2327. By Albert Astals Cid on 2016-04-04: Do not QCOMPARE a bool against 1

Timo Jyrinki (timo-jyrinki) wrote on 2016-04-04:

Looks good! https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/landing-011/+sourcepub/6280916/+listing-archive-extra

review: Approve

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-04-04:

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-04-04:

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

review: Needs Fixing (continuous-integration)

Michael Zanetti (mzanetti) wrote on 2016-04-06:

Looks good to me. tests passing here.

* 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.

unrelated failure

* Did you make sure that the branch does not contain spurious tags?

yes

review: Approve

Timo Jyrinki (timo-jyrinki) wrote on 2016-04-20:

Could this be landed so that it would be easier to rebuild against Qt 5.6 with less manual patching? Or would this MP need further changes to #ifdef by version?

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-04-20:

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

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Albert Astals Cid

Mohammad Rakibul Hasan

Unity Team

1	=== modified file 'tests/libs/UbuntuGestures/tst_TouchRegistry.cpp'
2	--- tests/libs/UbuntuGestures/tst_TouchRegistry.cpp 2016-03-11 20:18:12 +0000
3	+++ tests/libs/UbuntuGestures/tst_TouchRegistry.cpp 2016-04-04 08:34:10 +0000
4	@@ -712,7 +712,7 @@
5	touchRegistry->removeCandidateOwnerForTouch(0, &earlyCandidate);
6
7	QCOMPARE(lateCandidate.ownedTouches.count(), 1);
8	- QCOMPARE(lateCandidate.ownedTouches.contains(0), 1);
9	+ QVERIFY(lateCandidate.ownedTouches.contains(0));
10
11	// Check that there's no trace left of touch 0 as we no longer need to keep tabs on it.
12	QVERIFY(!touchRegistry->findTouchInfo(0));
13
14	=== modified file 'tests/mocks/Unity/InputInfo/qinputdeviceinfo_mock.cpp'
15	--- tests/mocks/Unity/InputInfo/qinputdeviceinfo_mock.cpp 2015-11-02 15:59:56 +0000
16	+++ tests/mocks/Unity/InputInfo/qinputdeviceinfo_mock.cpp 2016-04-04 08:34:10 +0000
17	@@ -23,7 +23,7 @@
18	QObject(parent),
19	currentFilter(QInputDevice::Unknown)
20	{
21	- QTimer::singleShot(1, SIGNAL(ready()));
22	+ QTimer::singleShot(1, this, SIGNAL(ready()));
23	}
24
25	QInputDeviceManagerPrivate::~QInputDeviceManagerPrivate()