AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
a09a8d509a
qt5base-lts/tests/auto
History
Frederik Gladhorn a09a8d509a Merge remote-tracking branch 'origin/5.3' into dev 
Conflicts:
	mkspecs/qnx-x86-qcc/qplatformdefs.h
	src/corelib/global/qglobal.h
	src/network/socket/qnativesocketengine_winrt.cpp
	src/plugins/platforms/android/androidjniaccessibility.cpp
	src/plugins/platforms/windows/qwindowswindow.cpp

Manually adjusted:
	mkspecs/qnx-armle-v7-qcc/qplatformdefs.h
	to include 9ce697f2d5

Thanks goes to Sergio for the qnx mkspecs adjustments.

Change-Id: I53b1fd6bc5bc884e5ee2c2b84975f58171a1cb8e
2014-07-01 16:25:19 +02:00
..
android Android: Add some ci usage features to Android testrunner 2014-04-09 10:46:40 +02:00
bic/data test: Add 5.1.0 bic data for linux-gcc-ia32 2013-07-08 21:47:36 +02:00
cmake purge vestiges of opengl es 1 support 2014-04-04 19:32:21 +02:00
compilerwarnings/data
concurrent Add diagnostic output to tst_QtConcurrentIterateKernel. 2014-04-09 10:43:32 +02:00
corelib Merge remote-tracking branch 'origin/5.3' into dev 2014-07-01 16:25:19 +02:00
dbus Fix dangling pointer dereferencing 2014-05-09 03:39:34 +02:00
gui Merge remote-tracking branch 'origin/5.3' into dev 2014-07-01 16:25:19 +02:00
guiapplauncher
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.3' into dev 2014-07-01 16:25:19 +02:00
opengl Merge remote-tracking branch 'origin/stable' into dev 2014-05-06 16:50:03 +02:00
other Merge remote-tracking branch 'origin/5.3' into dev 2014-07-01 16:25:19 +02:00
printsupport QPrinter - Expect failure of QPrinter page size test 2014-03-17 13:46:29 +01:00
shared iOS: Fix compilation of some basic tests 2014-01-17 11:04:43 +01:00
sql Use sched_yield instead of pthread_yield 2014-05-05 22:40:49 +02:00
testlib Merge remote-tracking branch 'origin/stable' into dev 2014-05-22 07:46:17 +02:00
tools Merge remote-tracking branch 'origin/5.3' into dev 2014-07-01 16:25:19 +02:00
widgets Merge remote-tracking branch 'origin/5.3' into dev 2014-07-01 16:25:19 +02:00
xml Speed up tst_QXmlSimpleReader. 2014-05-08 16:06:11 +02:00
auto.pro iOS: Enable building of basic tests 2014-01-22 12:35:17 +01:00
network-settings.h network test settings: support newer FTP server versions 2013-08-28 12:45:34 +02:00
qtest-config.h
test.pl Whitespace cleanup: remove trailing whitespace 2013-03-16 20:22:50 +01:00