AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6b8f422c5e
qt5base-lts/tests/auto
History
Liang Qi 6b8f422c5e Merge remote-tracking branch 'origin/5.6' into 5.7 
Conflicts:
	src/corelib/global/qglobal.cpp
	src/corelib/io/qsettings.cpp
	src/corelib/itemmodels/qstringlistmodel.cpp
	tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp

Change-Id: I1c6c306ef42c3c0234b19907914b19da706b4a03
2016-08-13 01:05:02 +02:00
..
android Updated license headers 2016-01-21 18:55:18 +00:00
bic/data bic: Add 5.{1,2,3,4}.0 bic data for linux-gcc-amd64 2015-02-14 06:54:20 +00:00
cmake Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-04 08:59:18 +02:00
compilerwarnings/data Updated license headers 2016-01-21 18:55:18 +00:00
concurrent QtConcurrentRun: add unittest for polling for isFinished() 2016-02-15 13:53:57 +00:00
corelib Merge remote-tracking branch 'origin/5.6' into 5.7 2016-08-13 01:05:02 +02:00
dbus Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-10 23:27:10 +02:00
gui Merge remote-tracking branch 'origin/5.6' into 5.7 2016-08-13 01:05:02 +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.6' into 5.7 2016-08-13 01:05:02 +02:00
opengl Merge remote-tracking branch 'origin/5.6.1' into 5.6 2016-06-02 06:01:25 +02:00
other Merge remote-tracking branch 'origin/5.6' into 5.7 2016-08-01 10:03:21 +02:00
printsupport Merge remote-tracking branch 'origin/5.6' into 5.7 2016-02-29 12:34:31 +01:00
shared Updated license headers 2016-01-21 18:55:18 +00:00
sql Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-20 08:00:26 +02:00
testlib Merge remote-tracking branch 'origin/5.6' into 5.7 2016-07-15 20:47:57 +02:00
tools Merge remote-tracking branch 'origin/5.6' into 5.7 2016-08-10 17:43:13 +02:00
widgets Merge remote-tracking branch 'origin/5.6' into 5.7 2016-08-10 17:43:13 +02:00
xml Updated license headers 2016-01-21 18:55:18 +00:00
auto.pro Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-04 08:59:18 +02:00
network-settings.h Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-06 15:36:44 +02:00
qtest-config.h Updated license headers 2016-01-21 18:55:18 +00:00
test.pl Updated license headers 2016-01-21 18:55:18 +00:00