qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
qtdeclarative/tests/auto/quick/qquickmousearea
History
Liang Qi 0932a59971 Merge remote-tracking branch 'origin/5.6' into 5.7 
Part of 0e053528 was reverted in the merge, about lastTimestamp. It
will be applied later in separate commit.

qmltest::shadersource-dynamic-sourceobject::test_endresult() was
blacklisted on linux.

Conflicts:
	.qmake.conf
	tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
	tests/auto/qmltest/BLACKLIST
	tests/auto/qmltest/qmltest.pro

Task-number: QTBUG-53590
Task-number: QTBUG-53971
Change-Id: I48af90b49a3c7b29de16f4178a04807f8bc05130
 		2016-06-10 10:06:39 +02:00
..
data MouseArea: add source property to mouse event 2016-03-11 12:15:26 +00:00
qquickmousearea.pro MouseArea: add source property to mouse event 2016-03-11 12:15:26 +00:00
tst_qquickmousearea.cpp Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-10 10:06:39 +02:00