AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
e32f1a4d61
qt5base-lts/qmake
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
..
doc Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-20 08:00:26 +02:00
generators Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-20 08:00:26 +02:00
library Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-20 08:00:26 +02:00
cachekeys.h Updated license headers 2016-01-21 18:55:18 +00:00
main.cpp Merge remote-tracking branch 'origin/5.6' into dev 2016-02-11 08:25:04 +01:00
Makefile.unix qmake/tools: port the last remaining Q_FOREACH loops and add QT_NO_FOREACH 2016-05-11 16:55:32 +00:00
Makefile.win32 qmake/tools: port the last remaining Q_FOREACH loops and add QT_NO_FOREACH 2016-05-11 16:55:32 +00:00
meta.cpp qmake: eradicate Q_FOREACH loops [needing qAsConst()] 2016-01-28 20:25:18 +00:00
meta.h Updated license headers 2016-01-21 18:55:18 +00:00
option.cpp qmake: use reserve to optimize memory allocation. 2016-02-01 20:57:59 +00:00
option.h qmake: eradicate Q_FOREACH loops [already const] 2016-01-28 20:25:21 +00:00
project.cpp qmake: eradicate Q_FOREACH loops [already const] 2016-01-28 20:25:21 +00:00
project.h Updated license headers 2016-01-21 18:55:18 +00:00
property.cpp qmake: eradicate Q_FOREACH loops [needing qAsConst()] 2016-01-28 20:25:18 +00:00
property.h Updated license headers 2016-01-21 18:55:18 +00:00
qmake_pch.h Updated license headers 2016-01-21 18:55:18 +00:00
qmake-aux.pro configure: Separate host and build platform. 2015-10-30 13:14:51 +00:00
qmake.pri nuke gbuild generator 2015-02-02 11:14:34 +00:00
qmake.pro qmake/tools: port the last remaining Q_FOREACH loops and add QT_NO_FOREACH 2016-05-11 16:55:32 +00:00