Liang Qi 1fadc7292b Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java src/plugins/platforms/windows/qwindowsfontengine.cpp src/plugins/platforms/windows/qwindowsnativeimage.cpp tests/auto/gui/kernel/qwindow/BLACKLIST tests/auto/gui/kernel/qwindow/tst_qwindow.cpp Change-Id: I649b32b260ce0ed2d6a5089021daa0d6a8db85f7		2016-02-24 13:31:14 +01:00
..
externalsites	Merge remote-tracking branch 'origin/5.6' into dev	2016-01-08 12:35:24 +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	Make documentation readable with dark color schemes.	2016-01-28 20:07:10 +00:00
compat.qdocconf	qdoc: Fix the qdoc \include command	2013-08-22 16:11:29 +02:00
config.qdocconf	Bump copyright year to 2016	2016-01-29 13:30:04 +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	Doc: Fixed QDoc's navigation mechanism.	2013-06-25 14:03:24 +02:00
html-header-online.qdocconf	Doc: Online template: dynamically load footer content	2015-12-09 11:47:49 +00:00
macros.qdocconf	qdoc: Fix output of \br command	2014-08-26 20:07:40 +02:00
manifest-meta.qdocconf	Doc: Update the list of highlighted examples	2015-11-30 11:44:28 +00:00
qt-cpp-defines.qdocconf	Doc: Evaluate QT_VERSION >= QT_VERSION_CHECK(6,0,0) to false	2016-02-22 08:33:57 +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	Doc: Fixed QDoc's navigation mechanism.	2013-06-25 14:03:24 +02:00