AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
f577a01f5e
qt5base-lts/qmake
History
Liang Qi af0d0b9c06 Merge remote-tracking branch 'origin/5.6' into 5.7 
Conflicts:
	src/plugins/platforms/ios/ios.pro
	src/plugins/platforms/ios/kernel.pro
	src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.h
	src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.mm
	src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileenginefactory.h
	src/plugins/platforms/ios/qiosintegration.h
	src/widgets/widgets/qcombobox.cpp
	tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
	tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp

Change-Id: Ibaee7cbbba99e7c4b1d8926e55932ffa6030ce45
2016-10-27 10:23:39 +02:00
..
doc Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-27 10:23:39 +02:00
generators Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-27 10:23:39 +02:00
library Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-01 22:15:55 +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 Merge remote-tracking branch 'origin/5.6' into 5.7 2016-07-15 20:47:57 +02:00
project.h Merge remote-tracking branch 'origin/5.6' into 5.7 2016-07-15 20:47:57 +02: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