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
..
externalsites	Merge remote-tracking branch 'origin/5.4' into 5.5	2015-02-24 21:02:08 +01:00
includes	Doc: Add a section all modules can use for example documentation.	2014-04-09 10:37:29 +02:00
includes-online	Update copyright headers	2015-02-11 06:49:51 +00:00
template	Merge remote-tracking branch 'origin/5.4' into dev	2014-12-10 07:58:06 +01:00
compat.qdocconf	qdoc: Fix the qdoc \include command	2013-08-22 16:11:29 +02:00
config.qdocconf	Update copyright headers	2015-02-11 06:49:51 +00:00
externalsites.qdocconf	Doc: Do not include the external sites by default	2014-09-03 09:40:59 +02:00
fileextensions.qdocconf	Doc: new template for qt.io online style	2014-12-03 12:20:07 +01:00
html-config.qdocconf	QDoc: Introduce a variable to set table of contents depth.	2014-06-11 15:13:29 +02:00
html-footer-online.qdocconf	Doc: Replace qt-project.org/doc with doc.qt.io	2015-02-14 06:54:45 +00:00
html-footer.qdocconf	Update copyright headers	2015-02-11 06:49:51 +00:00
html-header-offline.qdocconf	Doc: Fixed QDoc's navigation mechanism.	2013-06-25 14:03:24 +02:00
html-header-online.qdocconf	Replace blog.qt.digia.com with blog.qt.io	2015-02-06 15:49:48 +00:00
macros.qdocconf	qdoc: Fix output of \br command	2014-08-26 20:07:40 +02:00
manifest-meta.qdocconf	Move Qt Core examples under a common subdirectory	2014-10-17 14:57:13 +02:00
qt-cpp-defines.qdocconf	qdoc: Let qdoc ignore Q_ENUM and Q_FLAG	2015-02-20 09:31:33 +00:00
qt-html-templates-offline.qdocconf	Doc: Fixed QDoc's navigation mechanism.	2013-06-25 14:03:24 +02:00
qt-html-templates-online.qdocconf	Doc: new template for qt.io online style	2014-12-03 12:20:07 +01:00
qt-module-defaults-offline.qdocconf	Doc: new template for qt.io online style	2014-12-03 12:20:07 +01:00
qt-module-defaults-online-commercial.qdocconf	Doc: new template for qt.io online style	2014-12-03 12:20:07 +01:00
qt-module-defaults-online.qdocconf	Update copyright headers	2015-02-11 06:49:51 +00:00
qt-module-defaults.qdocconf	Doc: Fixed QDoc's navigation mechanism.	2013-06-25 14:03:24 +02:00