Frederik Gladhorn 34aba4724f Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: src/corelib/io/qiodevice.cpp src/plugins/bearer/linux_common/qofonoservice_linux.cpp src/plugins/bearer/linux_common/qofonoservice_linux_p.h src/plugins/platforms/android/qandroidplatformtheme.cpp src/tools/bootstrap/bootstrap.pro src/widgets/styles/qmacstyle_mac.mm Change-Id: Ia02aab6c4598ce74e9c30bb4666d5e2ef000f99b		2014-11-24 13:39:13 +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-11-24 13:39:13 +01:00
makefile.cpp	Update license headers and add new license files	2014-09-24 12:26:19 +02: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