Liang Qi bf58c70546 Merge remote-tracking branch 'origin/5.12' into dev ... Conflicts: src/corelib/io/qdir.cpp src/corelib/kernel/qtimer.cpp src/corelib/kernel/qtimer.h Done-With: Edward Welbourne <edward.welbourne@qt.io> Change-Id: I683d897760ec06593136d77955f8bc87fdef3f9f		2018-11-22 01:53:29 +01:00
..
android
bic/data	Add binary compatibility files for 5.11 for QtBase	2018-06-05 06:00:28 +00:00
cmake	Export modules' enabled/disabled features to cmake	2018-09-28 13:10:28 +00:00
concurrent	Merge remote-tracking branch 'origin/5.11' into dev	2018-02-16 08:54:58 +01:00
corelib	Merge remote-tracking branch 'origin/5.12' into dev	2018-11-22 01:53:29 +01:00
dbus	QDBusServiceWatcher namespace prefix support	2018-11-06 09:52:09 +00:00
gui	Merge remote-tracking branch 'origin/5.12' into dev	2018-11-22 01:53:29 +01:00
guiapplauncher
installed_cmake
network	Merge remote-tracking branch 'origin/5.12' into dev	2018-11-22 01:53:29 +01:00
opengl	macOS: Skip tst_QGLThreads::renderInThread	2018-11-09 08:10:36 +00:00
other	macOS: Remove blacklist entries for no longer supported OS versions	2018-11-12 07:16:30 +00:00
printsupport	Merge remote-tracking branch 'origin/5.11' into dev	2018-05-03 14:50:22 +02:00
shared
sql	Merge remote-tracking branch 'origin/5.12' into dev	2018-11-06 01:00:56 +01:00
testlib	Add qfloat16 support to QCOMPARE	2018-11-20 21:34:13 +00:00
tools	tst_uic: Brush up the uic autotest	2018-11-13 18:55:30 +00:00
widgets	Merge remote-tracking branch 'origin/5.12' into dev	2018-11-13 01:00:13 +01:00
xml
auto.pro	winrt: Skip network auto tests for now	2018-06-22 05:02:39 +00:00
network-settings.h	Docker-based test servers for network-related Qt autotests on macOS	2018-10-18 19:22:46 +00:00
testserver.pri	Make sure docker machine is both created and running before test	2018-10-23 05:26:31 +00:00