AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
a27f888dec
qt5base-lts/tests/auto/corelib/kernel/qtimer
History
Liang Qi d0a0a3c041 Merge remote-tracking branch 'origin/5.10' into dev 
Conflicts:
	examples/network/fortuneclient/client.cpp
	examples/network/fortuneserver/server.cpp
	src/platformsupport/platformcompositor/qopenglcompositorbackingstore_p.h
	src/plugins/platforms/cocoa/qcocoabackingstore.h
	src/plugins/platforms/cocoa/qcocoaintegration.h
	src/plugins/platforms/cocoa/qcocoascreen.h
	src/plugins/platforms/ios/qiosbackingstore.h
	src/plugins/sqldrivers/oci/qsql_oci.cpp
	src/widgets/kernel/qwidgetwindow.cpp

Change-Id: Ia6dd2c52d4a691b671cf9a2ffca70deccece8f10
2017-10-17 10:34:24 +02:00
..
.gitignore Moving relevant tests to corelib/kernel 2011-09-01 12:42:14 +02:00
BLACKLIST Blacklist tst_QTimer::basic_chrono on macOS 2017-06-01 07:27:59 +00:00
qtimer.pro Clean up OS version checks for Apple platforms 2017-09-29 03:30:13 +00:00
tst_qtimer.cpp Merge remote-tracking branch 'origin/5.10' into dev 2017-10-17 10:34:24 +02:00