AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
e32f1a4d61
qt5base-lts/qmake/generators
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
..
mac Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-25 14:03:45 +02:00
unix Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-20 08:00:26 +02:00
win32 Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-20 08:00:26 +02:00
makefile.cpp Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-20 08:00:26 +02:00
makefile.h Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-20 08:00:26 +02:00
makefiledeps.cpp Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-29 17:55:20 +02:00
makefiledeps.h Updated license headers 2016-01-21 18:55:18 +00:00
metamakefile.cpp Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-29 17:55:20 +02:00
metamakefile.h Updated license headers 2016-01-21 18:55:18 +00:00
projectgenerator.cpp Updated license headers 2016-01-21 18:55:18 +00:00
projectgenerator.h Updated license headers 2016-01-21 18:55:18 +00:00
xmloutput.cpp Merge remote-tracking branch 'origin/5.6' into dev 2016-02-11 08:25:04 +01:00
xmloutput.h Updated license headers 2016-01-21 18:55:18 +00:00