AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
e3ed2281c0
qt5base-lts/tests/auto
History
Liang Qi e3ed2281c0 Merge remote-tracking branch 'origin/5.11' into dev 
Conflicts:
	src/plugins/platforms/cocoa/qnsview.mm
	src/plugins/platforms/cocoa/qnsview_dragging.mm
	src/plugins/platforms/ios/qiosinputcontext.mm
	src/plugins/platforms/xcb/qxcbconnection.cpp
	src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
	src/plugins/platforms/xcb/qxcbwindow.cpp
	src/tools/androiddeployqt/main.cpp
		Was moved from qttools into qtbase in 5.11.
		So re-apply 32398e4d here.
	tests/auto/corelib/global/qlogging/test/test.pro
	tests/auto/corelib/global/qlogging/tst_qlogging.cpp
	tests/auto/corelib/io/qfile/tst_qfile.cpp
	tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
	tests/auto/corelib/thread/qthreadstorage/test/test.pro
	tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
	tests/auto/widgets/kernel/qapplication/test/test.pro

Done-with: Gatis Paeglis <gatis.paeglis@qt.io>
Done-with: Mårten Nordheim <marten.nordheim@qt.io>
Done-with: Oliver Wolff <oliver.wolff@qt.io>
Change-Id: Id970486c5315a1718c540f00deb2633533e8fc7b
2018-07-02 11:23:45 +02:00
..
android
bic/data Add binary compatibility files for 5.11 for QtBase 2018-06-05 06:00:28 +00:00
cmake CMake: Restore qt5_use_modules() function 2018-06-15 07:29:09 +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.11' into dev 2018-07-02 11:23:45 +02:00
dbus tests/auto/dbus: Avoid unconditional qWait()s 2018-04-12 05:49:07 +00:00
gui Merge remote-tracking branch 'origin/5.11' into dev 2018-07-02 11:23:45 +02:00
guiapplauncher
installed_cmake
network Merge remote-tracking branch 'origin/5.11' into dev 2018-07-02 11:23:45 +02:00
opengl tst_QGL: Use qWaitForWindowExposed() 2018-04-11 06:05:46 +00:00
other Merge remote-tracking branch 'origin/5.11' into dev 2018-07-02 11:23:45 +02:00
printsupport Merge remote-tracking branch 'origin/5.11' into dev 2018-05-03 14:50:22 +02:00
shared
sql MySQL: Handle TIME types as a string to allow the full range of data 2018-06-06 11:14:03 +00:00
testlib Merge remote-tracking branch 'origin/5.11' into dev 2018-07-02 11:23:45 +02:00
tools qmake: make argument validation of built-ins data driven 2018-06-27 17:23:57 +00:00
widgets Merge remote-tracking branch 'origin/5.11' into dev 2018-07-02 11:23:45 +02: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 winrt: Skip network auto tests for now 2018-06-22 05:02:39 +00:00
network-settings.h