Frederik Gladhorn 34b14a8472 Merge remote-tracking branch 'origin/5.4' into 5.5 ... Conflicts: examples/xml/htmlinfo/simpleexample.html examples/xml/rsslisting/rsslisting.cpp qmake/generators/win32/msbuild_objectmodel.cpp src/3rdparty/harfbuzz-ng/src/hb-private.hh src/corelib/global/qlogging.cpp src/corelib/io/qstorageinfo_unix.cpp src/corelib/thread/qwaitcondition_unix.cpp src/gui/kernel/qguiapplication.cpp src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp src/testlib/doc/src/qt-webpages.qdoc tests/auto/other/qaccessibility/tst_qaccessibility.cpp Change-Id: Ib272ff0bc30a1a5d51275eb3cd2f201dc82c11ff		2015-02-24 21:02:08 +01:00
..
mac	fix fixPathToTargetOS() nesting	2015-02-17 18:27:49 +00:00
unix	remove pointless fixPathToTargetOS() calls	2015-02-17 18:27:47 +00:00
win32	Merge remote-tracking branch 'origin/5.4' into 5.5	2015-02-24 21:02:08 +01:00
makefile.cpp	untangle handling extra compiler .clean member	2015-02-17 18:27:51 +00:00
makefile.h	fix quoting issues. all of them. (*)	2015-02-17 18:27:29 +00:00
makefiledeps.cpp	replace incorrect uses of fixPathToLocalOS() (mostly)	2015-02-17 18:27:44 +00:00
makefiledeps.h	Update copyright headers	2015-02-11 06:49:51 +00:00
metamakefile.cpp	Update copyright headers	2015-02-11 06:49:51 +00:00
metamakefile.h	Update copyright headers	2015-02-11 06:49:51 +00:00
projectgenerator.cpp	fix filename handling in replaceExtraCompilerVariables()	2015-02-17 18:27:25 +00:00
projectgenerator.h	Update copyright headers	2015-02-11 06:49:51 +00:00
xmloutput.cpp	Update copyright headers	2015-02-11 06:49:51 +00:00
xmloutput.h	Update copyright headers	2015-02-11 06:49:51 +00:00