qt5base-lts/qmake/generators
Liang Qi cdb56c42fc Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
	mkspecs/features/uikit/xcodebuild.mk
	tests/auto/other/lancelot/tst_lancelot.cpp
	tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp
	tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp

Change-Id: Ia0ae2de86094120281abd445138877c2cc3e882c
2016-09-29 00:38:01 +02:00
..
mac Merge remote-tracking branch 'origin/5.7' into 5.8 2016-09-29 00:38:01 +02:00
unix Enable precompiled headers on iOS, tvOS, watchOS 2016-09-02 08:25:31 +00:00
win32 win32: Fix Visual Studio project generation 2016-09-22 09:36:18 +00:00
makefile.cpp fix argument order in recursive qmake invocations 2016-08-25 11:55:32 +00:00
makefile.h qmake: Mark MakefileGenerator::Compiler as Q_MOVABLE_TYPE 2016-08-15 22:16:59 +00:00
makefiledeps.cpp Parse namespaces only for current file, add Q_NAMESPACE support to qmake 2016-09-06 10:29:21 +00:00
makefiledeps.h qmake: replace a uint:1 with a bool 2016-08-15 22:16:09 +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