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
..
main.cpp	Updated BSD licensed file headers	2015-02-15 07:41:17 +00:00
rsslisting.cpp	Merge remote-tracking branch 'origin/5.4' into 5.5	2015-02-24 21:02:08 +01:00
rsslisting.h	Updated BSD licensed file headers	2015-02-15 07:41:17 +00:00
rsslisting.pro	centralize and fixup example sources install targets	2012-11-29 20:21:11 +01:00