qt5base-lts/tests/auto
Liang Qi 305dd1b61f Merge remote-tracking branch 'origin/5.9' into 5.11
Conflicts:
	.qmake.conf
	src/corelib/animation/qvariantanimation.cpp
	src/corelib/global/qglobal.cpp
	src/corelib/global/qlogging.cpp
	src/corelib/io/qprocess_win.cpp
	src/corelib/json/qjsonarray.cpp
	src/corelib/tools/qsimd_p.h
	src/corelib/tools/qtimezoneprivate_p.h
	src/corelib/xml/qxmlstream_p.h
	src/gui/kernel/qsimpledrag.cpp
	src/gui/kernel/qsimpledrag_p.h
	src/plugins/generic/generic.pro
	src/plugins/platforms/cocoa/qcocoamenu.mm
	src/widgets/styles/qmacstyle_mac.mm
	tests/auto/concurrent/qtconcurrentmap/BLACKLIST
	tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
	tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
	tests/auto/gui/kernel/qwindow/BLACKLIST
	tests/auto/widgets/dialogs/qmessagebox/BLACKLIST

Change-Id: I508d686cf20f7f8cc6a7119b9bc7c3bbb505c58e
2018-02-14 12:51:24 +01:00
..
android
bic/data Add binary compatibility files for QtBase for 5.10 2018-01-04 16:26:32 +00:00
cmake CMake: Set SKIP_AUTOMOC/AUTOUIC where needed 2017-11-22 13:51:30 +00:00
compilerwarnings/data
concurrent Merge remote-tracking branch 'origin/5.9' into 5.11 2018-02-14 12:51:24 +01:00
corelib Merge remote-tracking branch 'origin/5.9' into 5.11 2018-02-14 12:51:24 +01:00
dbus Merge remote-tracking branch 'origin/5.9' into 5.11 2018-02-14 12:51:24 +01:00
gui Merge remote-tracking branch 'origin/5.9' into 5.11 2018-02-14 12:51:24 +01:00
guiapplauncher
installed_cmake
network Merge remote-tracking branch 'origin/5.9' into 5.11 2018-02-14 12:51:24 +01:00
opengl qtbase: cleanup BLACKLIST files 2018-02-13 15:20:33 +00:00
other Merge remote-tracking branch 'origin/5.9' into 5.11 2018-02-14 12:51:24 +01:00
printsupport Convert features.completer to QT_[REQUIRE_]CONFIG 2017-09-04 11:28:02 +00:00
shared Remove workaround for potentially unavailable pasteboard in macOS 2017-03-07 01:04:46 +00:00
sql Make it easier to specify test databases on a per system level 2018-01-26 11:33:07 +00:00
testlib QTestlib/selftests: Refactor the code printing output differences 2018-01-24 14:38:58 +00:00
tools Merge remote-tracking branch 'origin/5.9' into 5.11 2018-02-14 12:51:24 +01:00
widgets Merge remote-tracking branch 'origin/5.9' into 5.11 2018-02-14 12:51:24 +01:00
xml Don't indefinitely wait for data if it was able to read some data 2018-01-24 05:54:31 +00:00
auto.pro tests/auto/auto.pro: Use correct null device for DBUS check 2017-12-01 09:53:07 +00:00
network-settings.h