AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17519feadd
qt5base-lts/tests/auto
History
Liang Qi e32f1a4d61 Merge remote-tracking branch 'origin/5.6' into 5.7 
And blacklisted a few tests in tst_QUdpSocket.

Conflicts:
	src/android/jar/src/org/qtproject/qt5/android/QtNative.java
	src/corelib/global/qglobal.cpp
	src/corelib/global/qsystemdetection.h
	src/corelib/io/qfileselector.cpp
	src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp
	tests/auto/network/socket/qudpsocket/BLACKLIST

Task-number: QTBUG-54205
Change-Id: I11dd1c90186eb1b847d45be87a26041f61d89ef6
2016-06-20 08:00:26 +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 QDataStream: do not lose error status while reading containers 2016-06-15 07:43:54 +00: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-06-20 08:00:26 +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-06-20 08:00:26 +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-06-06 09:04:55 +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-05-19 12:55:27 +02:00
tools tst_Moc: restore signals/slots/emit to the Q_UPPERCASE values 2016-05-30 14:02:19 +00:00
widgets Merge remote-tracking branch 'origin/5.7.0' into 5.7 2016-06-16 07:30:02 +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