qt6-bb10/qmake/generators
Liang Qi d148019f16 Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
	src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp

Change-Id: I0af32ee55936d523cbd259b6fe82eb9c409f9074
2016-09-16 23:16:25 +02:00
..
mac Merge remote-tracking branch 'origin/5.6' into 5.7 2016-09-16 23:16:25 +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-04-29 17:55:20 +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