AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
e32f1a4d61
qt5base-lts/tests/auto/sql/kernel
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
..
qsql Updated license headers 2016-01-21 18:55:18 +00:00
qsqldatabase Merge remote-tracking branch 'origin/5.6' into dev 2016-02-02 15:57:44 +01:00
qsqldriver Updated license headers 2016-01-21 18:55:18 +00:00
qsqlerror Updated license headers 2016-01-21 18:55:18 +00:00
qsqlfield Updated license headers 2016-01-21 18:55:18 +00:00
qsqlquery Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-20 08:00:26 +02:00
qsqlrecord Updated license headers 2016-01-21 18:55:18 +00:00
qsqlresult Updated license headers 2016-01-21 18:55:18 +00:00
qsqlthread Updated license headers 2016-01-21 18:55:18 +00:00
kernel.pro SQL: Change in QSqlResultPrivate::positionalToNamedBinding() 2012-12-10 21:23:35 +01:00