qt5base-lts/tests/auto/gui/kernel/qtouchevent
Liang Qi b131503361 Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
	configure
	configure.pri
	examples/widgets/painting/fontsampler/mainwindow.cpp
	examples/widgets/painting/fontsampler/mainwindow.h
	mkspecs/features/moc.prf
	src/corelib/global/qglobal.h
	src/gui/text/qtextdocument.cpp

Change-Id: Ica65512e00871695190a14ccea5c275b0165f787
2016-12-16 16:38:33 +01:00
..
BLACKLIST Stabilize tst_qtouchevent. 2015-06-01 13:39:13 +00:00
qtouchevent.pro Reanimate test gui/kernel/qtouchevent/tst_qtouchevent. 2015-05-29 16:36:48 +00:00
tst_qtouchevent.cpp Merge remote-tracking branch 'origin/5.8' into dev 2016-12-16 16:38:33 +01:00