Liang Qi cdb56c42fc Merge remote-tracking branch 'origin/5.7' into 5.8 ... Conflicts: mkspecs/features/uikit/xcodebuild.mk tests/auto/other/lancelot/tst_lancelot.cpp tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp Change-Id: Ia0ae2de86094120281abd445138877c2cc3e882c		2016-09-29 00:38:01 +02:00
..
externalsites	Add \externalpage for The Qt Company	2016-08-12 06:55:04 +00:00
includes	Doc: Add a section all modules can use for example documentation.	2014-04-09 10:37:29 +02:00
includes-online	Unify license header usage.	2016-03-29 10:20:03 +00:00
template	Remove hiding of .main div in offline pages	2016-08-05 12:45:19 +00:00
compat.qdocconf
config.qdocconf	Automatically generate code attribution documentation	2016-08-10 06:11:18 +00:00
externalsites.qdocconf	Doc: Do not include the external sites by default	2014-09-03 09:40:59 +02:00
fileextensions.qdocconf	Add shader files to examples documentation file list	2015-09-22 21:40:13 +00: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	Bump copyright year to 2016	2016-01-29 13:30:04 +00:00
html-footer.qdocconf	Bump copyright year to 2016	2016-01-29 13:30:04 +00:00
html-header-offline.qdocconf
html-header-online.qdocconf	Doc: Online template: dynamically load footer content	2015-12-09 11:47:49 +00:00
macros.qdocconf	Doc: Add a custom \borderedimage macro	2016-09-23 10:48:38 +00:00
manifest-meta.qdocconf	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-07-26 10:43:29 +02:00
qt-cpp-defines.qdocconf	Say hello to Q_NAMESPACE	2016-08-19 15:41:27 +00:00
qt-html-templates-offline-simple.qdocconf	Doc: Use a navigation separator in the simple offline template	2015-10-28 11:55:05 +00:00
qt-html-templates-offline.qdocconf	Doc: Improve selection of offline template type	2015-10-21 08:15:35 +00:00
qt-html-templates-online.qdocconf	Doc: Update online documentation template	2015-02-26 12:26:15 +00:00
qt-module-defaults-offline.qdocconf	Doc: Improve selection of offline template type	2015-10-21 08:15:35 +00:00
qt-module-defaults-online-commercial.qdocconf	Doc: Update online documentation template	2015-02-26 12:26:15 +00:00
qt-module-defaults-online.qdocconf	Bump copyright year to 2016	2016-01-29 13:30:04 +00:00
qt-module-defaults.qdocconf