AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
305dd1b61f
qt5base-lts/tests/auto/other
History
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 Updated license headers 2016-01-21 18:55:18 +00:00
compiler Tests: Raise minimum supported MSVC version to 2015 2018-01-04 20:23:25 +00:00
gestures qtbase: cleanup BLACKLIST files 2018-02-13 15:20:33 +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 Cocoa: Make AA_MacDontSwapCtrlMeta work 2018-01-08 07:18:01 +00:00
macplist Use dependencies instead of CONFIG+=ordered 2017-12-02 11:09:15 +00:00
networkselftest Change almost all other uses of qrand() to QRandomGenerator 2017-11-08 09:14:03 +00:00
qabstractitemmodelutils QAbstractItemModelTester: fix the autotests 2018-01-09 21:12:58 +00:00
qaccessibility Update usage of QFontMetrics::width() to new API 2017-12-08 15:06:32 +00: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 Remove references to obsolete platforms 2017-11-05 06:33:53 +00:00
qnetworkaccessmanager_and_qprogressdialog test: blacklist tst_QNetworkAccessManager_And_QProgressDialog::downloadCheck(with-zeroCopy) 2017-11-15 05:12:15 +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 Support for Q_OS_ANDROID_EMBEDDED and android-embedded build flags 2018-01-20 18:16:59 +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 QAbstractItemModelTester: fix the autotests 2018-01-09 21:12:58 +00:00