Frederik Gladhorn b6191b16d4 Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: src/corelib/global/global.pri src/corelib/global/qcompilerdetection.h src/corelib/global/qglobal.h src/corelib/tools/qdatetime.cpp src/plugins/platforms/xcb/qxcbscreen.h src/plugins/platforms/xcb/qxcbwindow.h src/widgets/dialogs/qcolordialog.cpp src/widgets/dialogs/qcolordialog_p.h tools/configure/configureapp.cpp Change-Id: Ie9d6e9df13e570da0a90a67745a0d05f46c532af		2015-01-21 11:10:14 +01:00
..
externalsites	Doc: added entry for link to main page Qt Creator	2015-01-16 10:29:35 +01:00
includes	Doc: Add a section all modules can use for example documentation.	2014-04-09 10:37:29 +02:00
includes-online	Doc: new template for qt.io online style	2014-12-03 12:20:07 +01: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	Doc: new template for qt.io online style	2014-12-03 12:20:07 +01: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: new template for qt.io online style	2014-12-03 12:20:07 +01:00
html-footer.qdocconf	Doc: Update year to 2014	2014-03-27 15:22:33 +01:00
html-header-offline.qdocconf	Doc: Fixed QDoc's navigation mechanism.	2013-06-25 14:03:24 +02:00
html-header-online.qdocconf	Change bugreports.qt-project.org -> bugreports.qt.io	2014-12-18 09:46:09 +01: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	Use the new warning enabling/disabling macros in qtbase	2014-12-03 18:09:17 +01: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	Doc: new template for qt.io online style	2014-12-03 12:20:07 +01:00
qt-module-defaults.qdocconf	Doc: Fixed QDoc's navigation mechanism.	2013-06-25 14:03:24 +02:00