AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
a1ad9a74eb
qt5base-lts/tests/auto
History
Liang Qi a1ad9a74eb Merge remote-tracking branch 'origin/5.6' into dev 
Conflicts:
	src/corelib/io/io.pri
	src/corelib/io/qdatastream.cpp
	src/corelib/io/qdatastream.h
	src/network/socket/qabstractsocket.cpp
	src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
	src/plugins/platforms/cocoa/qcocoaaccessibilityelement.h
	src/widgets/styles/qgtkstyle.cpp
	tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/qmimedatabase-cache.pro
	tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro
	tests/auto/dbus/qdbusconnection/qdbusconnection.pro
	tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp
	tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp

Change-Id: I347549a024eb5bfa986699e0a11f96cc55c797a7
2015-09-25 14:02:04 +02:00
..
android Fix typo in test results report for android 2015-07-28 21:16:19 +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 CMake: Fix regression with quoted OPTIONS parameter 2015-03-11 07:31:33 +00:00
compilerwarnings/data Fixed license headers 2015-02-17 18:46:09 +00:00
concurrent Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
corelib Merge remote-tracking branch 'origin/5.6' into dev 2015-09-25 14:02:04 +02:00
dbus Merge remote-tracking branch 'origin/5.6' into dev 2015-09-25 14:02:04 +02:00
gui Merge remote-tracking branch 'origin/5.6' into dev 2015-09-25 14:02:04 +02:00
guiapplauncher Fix path to examples part of tst_GuiAppLauncher 2015-02-13 07:28:15 +00:00
installed_cmake
network Merge remote-tracking branch 'origin/5.6' into dev 2015-09-25 14:02:04 +02:00
opengl Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
other Merge remote-tracking branch 'origin/5.6' into dev 2015-09-25 14:02:04 +02:00
printsupport Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
shared Update copyright headers 2015-02-11 06:49:51 +00:00
sql Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
testlib Merge remote-tracking branch 'origin/5.6' into dev 2015-09-25 14:02:04 +02:00
tools Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
widgets Merge remote-tracking branch 'origin/5.6' into dev 2015-09-25 14:02:04 +02:00
xml Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
auto.pro Merge remote-tracking branch 'origin/5.6' into dev 2015-09-25 14:02:04 +02:00
network-settings.h Update copyright headers 2015-02-11 06:49:51 +00:00
qtest-config.h Update copyright headers 2015-02-11 06:49:51 +00:00
test.pl Update copyright headers 2015-02-11 06:49:51 +00:00