AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
592da13664
qt5base-lts/qmake/library
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
..
ioutils.cpp Updated license headers 2016-01-21 18:55:18 +00:00
ioutils.h Updated license headers 2016-01-21 18:55:18 +00:00
proitems.cpp qmake: eradicate Q_FOREACH loops [already const] 2016-01-28 20:25:21 +00:00
proitems.h add ProString::toLongLong() and make use of it 2016-05-19 17:32:50 +00:00
qmake_global.h Updated license headers 2016-01-21 18:55:18 +00:00
qmakebuiltins.cpp Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-20 08:00:26 +02:00
qmakeevaluator_p.h Updated license headers 2016-01-21 18:55:18 +00:00
qmakeevaluator.cpp qmake: use reserve to optimize memory allocation. 2016-02-01 20:57:59 +00:00
qmakeevaluator.h Updated license headers 2016-01-21 18:55:18 +00:00
qmakeglobals.cpp Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-20 08:00:26 +02:00
qmakeglobals.h Updated license headers 2016-01-21 18:55:18 +00:00
qmakeparser.cpp Merge remote-tracking branch 'origin/5.6' into 5.7 2016-03-11 20:08:50 +01:00
qmakeparser.h Updated license headers 2016-01-21 18:55:18 +00:00
qmakevfs.cpp Updated license headers 2016-01-21 18:55:18 +00:00
qmakevfs.h Updated license headers 2016-01-21 18:55:18 +00:00