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
..
doc	Merge remote-tracking branch 'origin/5.4' into 5.5	2015-02-24 21:02:08 +01:00
generators	Merge remote-tracking branch 'origin/5.4' into 5.5	2015-02-24 21:02:08 +01:00
library	Merge remote-tracking branch 'origin/5.4' into 5.5	2015-02-24 21:02:08 +01:00
cachekeys.h	Update copyright headers	2015-02-11 06:49:51 +00:00
main.cpp	Update copyright headers	2015-02-11 06:49:51 +00:00
Makefile.unix	nuke gbuild generator	2015-02-02 11:14:34 +00:00
Makefile.win32	nuke gbuild generator	2015-02-02 11:14:34 +00:00
meta.cpp	fix quoting issues. all of them. (*)	2015-02-17 18:27:29 +00:00
meta.h	Update copyright headers	2015-02-11 06:49:51 +00:00
option.cpp	Update copyright headers	2015-02-11 06:49:51 +00:00
option.h	Update copyright headers	2015-02-11 06:49:51 +00:00
project.cpp	Update copyright headers	2015-02-11 06:49:51 +00:00
project.h	Update copyright headers	2015-02-11 06:49:51 +00:00
property.cpp	Update copyright headers	2015-02-11 06:49:51 +00:00
property.h	Update copyright headers	2015-02-11 06:49:51 +00:00
qmake_pch.h	Update copyright headers	2015-02-11 06:49:51 +00:00
qmake-docs.pro	move qmake docs into qtbase	2013-06-17 15:41:55 +02:00
qmake.pri	nuke gbuild generator	2015-02-02 11:14:34 +00:00
qmake.pro	bring fake qmake project up to snuff	2013-11-04 19:50:07 +01:00