whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/qmake/generators
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
..
mac Merge remote-tracking branch 'origin/5.6' into 5.7 2016-09-23 22:28:33 +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-08-13 01:05:02 +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-10-27 10:23:39 +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