AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
484fc8545f
qt5base-lts/tests/auto
History
Liang Qi ef37ab9970 Merge remote-tracking branch 'origin/5.12' into dev 
Conflicts:
	.qmake.conf
	src/gui/painting/qdrawhelper.cpp
	src/gui/text/qdistancefield.cpp
	src/gui/text/qdistancefield_p.h
	src/network/ssl/qsslsocket_openssl.cpp
	src/plugins/platforms/android/qandroidinputcontext.cpp
	src/widgets/styles/qstylesheetstyle.cpp

Done-With: Timur Pocheptsov <timur.pocheptsov@qt.io>
Change-Id: Ia7daad21f077ea889898f17734ec46303e71fe6b
2019-06-25 13:04:27 +02:00
..
bic/data Add binary compatibility files for 5.12 for QtBase 2018-12-21 19:42:57 +00:00
cmake cmake: correct version dependency for qt5_add_big_resources 2019-05-20 12:49:37 +02:00
concurrent Port from QAtomic::load() to loadRelaxed() 2019-06-20 20:48:59 +02:00
corelib Merge remote-tracking branch 'origin/5.12' into dev 2019-06-25 13:04:27 +02:00
dbus Port from QAtomic::load() to loadRelaxed() 2019-06-20 20:48:59 +02:00
gui Merge remote-tracking branch 'origin/5.12' into dev 2019-06-25 13:04:27 +02:00
guiapplauncher Fix path to examples part of tst_GuiAppLauncher 2015-02-13 07:28:15 +00:00
installed_cmake Add a unit test for testing Qt in its install location. 2013-07-02 23:08:54 +02:00
network Merge remote-tracking branch 'origin/5.12' into dev 2019-06-25 13:04:27 +02:00
opengl Convert uses of QTime as a timer to QElapsedTimer 2019-06-14 10:42:33 +02:00
other Merge remote-tracking branch 'origin/5.12' into dev 2019-06-25 13:04:27 +02:00
printsupport test: migrate QPrinterInfo test to QRegularExpression 2019-06-11 09:08:11 +02:00
shared Make tst_qwidget pass on High-DPI screens (Windows) 2019-06-03 10:41:08 +02:00
sql Port from QAtomic::load() to loadRelaxed() 2019-06-20 20:48:59 +02:00
testlib Convert uses of QTime as a timer to QElapsedTimer 2019-06-14 10:42:33 +02:00
tools Merge remote-tracking branch 'origin/5.13' into dev 2019-05-15 07:11:41 +02:00
widgets Merge remote-tracking branch 'origin/5.12' into dev 2019-06-25 13:04:27 +02:00
xml Convert uses of QTime as a timer to QElapsedTimer 2019-06-14 10:42:33 +02:00
auto.pro winrt: Skip network auto tests for now 2018-06-22 05:02:39 +00:00
network-settings.h test: migrate QNetworkReply test to QRegularExpression 2019-06-10 16:49:19 +02:00