AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
d0a0a3c041
qt5base-lts/tests/auto/other
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
..
android Updated license headers 2016-01-21 18:55:18 +00:00
compiler Merge remote-tracking branch 'origin/5.7' into 5.8 2016-09-05 18:47:27 +02:00
gestures autotests: use QTest::createTouchDevice() 2016-06-10 13:07:17 +00:00
lancelot Merge remote-tracking branch 'origin/5.9' into dev 2017-06-07 14:02:43 +02:00
languagechange winrt: Fix tst_qlanguagechange 2017-06-19 07:06:00 +00:00
macgui Blacklist tst_MacGui::nonModalOrder 2017-07-27 09:08:58 +00:00
macnativeevents Ignore tests that fail on OpenNebula 2017-08-03 09:30:06 +00:00
macplist macOS: Don't build auto-tests as application bundles unless explicitly requested 2016-10-23 10:39:56 +00:00
modeltest ModelTest: cleanups 2017-09-17 21:27:58 +00:00
networkselftest Properly use the "process" feature 2017-02-27 15:44:46 +00:00
qaccessibility Merge remote-tracking branch 'origin/5.10' into dev 2017-10-17 10:34:24 +02:00
qaccessibilitylinux Ensure result of all QTest::qWaitFor are verified 2017-10-05 15:15:36 +00:00
qaccessibilitymac Ensure result of all QTest::qWaitFor are verified 2017-10-05 15:15:36 +00:00
qcomplextext Updated license headers 2016-01-21 18:55:18 +00:00
qfocusevent Merge remote-tracking branch 'origin/5.9' into dev 2017-08-08 11:48:10 +02:00
qnetworkaccessmanager_and_qprogressdialog Updated license headers 2016-01-21 18:55:18 +00:00
qobjectperformance Updated license headers 2016-01-21 18:55:18 +00:00
qobjectrace Merge remote-tracking branch 'origin/5.6' into 5.7 2016-08-01 10:03:21 +02:00
qprocess_and_guieventloop Properly use the "process" feature 2017-02-27 15:44:46 +00:00
qsharedpointer_and_qwidget Updated license headers 2016-01-21 18:55:18 +00:00
qtokenautomaton tests: Unify license to GPL-EXCEPT 2017-04-03 07:18:46 +00:00
qvariant_common Updated license headers 2016-01-21 18:55:18 +00:00
toolsupport Fix tst_toolsupport on 32-bit arm platform 2017-04-12 08:36:27 +00:00
other.pro Merge remote-tracking branch 'origin/5.8' into 5.9 2017-03-13 15:55:44 +01:00