AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
d2c6294bd5
qt5base-lts/qmake
History
Liang Qi 57057f76ad Merge remote-tracking branch 'origin/5.6' into 5.7 
Conflicts:
	.qmake.conf
	config.tests/unix/nis/nis.cpp
	mkspecs/unsupported/freebsd-g++/qplatformdefs.h
	src/corelib/tools/qdatetime.cpp
	src/corelib/tools/qsimd.cpp
	src/corelib/tools/qsimd_p.h
	src/network/access/access.pri
	src/network/access/qnetworkreplynsurlconnectionimpl.mm
	src/network/access/qnetworkreplynsurlconnectionimpl_p.h
	src/plugins/platforms/cocoa/qnsview.mm
	src/plugins/printsupport/windows/qwindowsprintdevice.cpp
	tests/auto/corelib/kernel/qobject/tst_qobject.cpp
	tests/auto/network/access/qnetworkreply/BLACKLIST
	tests/auto/widgets/widgets/qopenglwidget/BLACKLIST

Change-Id: I4b32055bbf922392ef0264fd403405416fffee57
2016-06-06 09:04:55 +02:00
..
doc Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-06 09:04:55 +02:00
generators Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-19 12:55:27 +02:00
library add ProString::toLongLong() and make use of it 2016-05-19 17:32:50 +00: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