Frederik Gladhorn 98d3e40fb7 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: mkspecs/qnx-armv7le-qcc/qplatformdefs.h src/printsupport/kernel/qcups.cpp src/widgets/styles/qstyle.h tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp Change-Id: Ia41e13051169a6d4a8a1267548e7d47b859bb267		2014-04-11 14:36:55 +02:00
..
externalsites	Doc: fix link to changed topic title in Qt Creator Manual	2014-04-04 10:02:59 +02:00
includes	Doc: Add a section all modules can use for example documentation.	2014-04-09 10:37:29 +02:00
template	Doc: Fix template code for unordered lists	2014-04-09 20:53:06 +02:00
compat.qdocconf	qdoc: Fix the qdoc \include command	2013-08-22 16:11:29 +02:00
config.qdocconf	Doc: Add a section all modules can use for example documentation.	2014-04-09 10:37:29 +02:00
fileextensions.qdocconf	Doc: Fixed QDoc's navigation mechanism.	2013-06-25 14:03:24 +02:00
html-config.qdocconf	Doc: Fixed QDoc's navigation mechanism.	2013-06-25 14:03:24 +02: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	Doc: Fixed QDoc's navigation mechanism.	2013-06-25 14:03:24 +02:00
macros.qdocconf	Doc: Reintroduce \beginqdoc and \endqdoc macros	2013-09-10 11:14:28 +02:00
manifest-meta.qdocconf	Updated the list of examples tagged for Android	2014-01-23 13:01:47 +01:00
qt-cpp-defines.qdocconf	qdoc: Links to Q_DECL_FINAL not created	2014-04-09 08:56:57 +02: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: Fixed QDoc's navigation mechanism.	2013-06-25 14:03:24 +02:00
qt-module-defaults-offline.qdocconf	Doc: Fixed QDoc's navigation mechanism.	2013-06-25 14:03:24 +02:00
qt-module-defaults-online.qdocconf	Doc: Fixed QDoc's navigation mechanism.	2013-06-25 14:03:24 +02:00
qt-module-defaults.qdocconf	Doc: Fixed QDoc's navigation mechanism.	2013-06-25 14:03:24 +02:00