Simon Hausmann 015002fec9 Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: doc/global/template/style/online.css mkspecs/android-g++/qmake.conf Change-Id: Ib39ea7bd42f5ae12e82a3bc59a66787a16bdfc61		2014-12-10 07:58:06 +01:00
..
integrity	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
mac	Xcode: Make sure QMAKE_PRE_LINK dependencies are complete for multi-arch builds	2014-11-12 14:01:33 +01:00
unix	Add CFBundleIdentifier to the bundle Info.plist's	2014-11-10 16:04:12 +01:00
win32	Merge remote-tracking branch 'origin/5.4' into dev	2014-12-10 07:58:06 +01:00
makefile.cpp	qmake: Add .qmake.stash/super to QMAKE_DISTCLEAN when owned by project	2014-12-03 22:06:15 +01:00
makefile.h	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
makefiledeps.cpp	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
makefiledeps.h	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
metamakefile.cpp	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
metamakefile.h	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
projectgenerator.cpp	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
projectgenerator.h	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
xmloutput.cpp	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
xmloutput.h	Update license headers and add new license files	2014-09-24 12:26:19 +02:00