Liang Qi ce09ef4313 Merge remote-tracking branch 'origin/5.9' into dev ... Conflicts: src/corelib/io/qprocess_unix.cpp src/corelib/io/qprocess_win.cpp src/plugins/platforms/android/qandroidplatformintegration.h src/plugins/platforms/windows/qwindowscontext.cpp src/plugins/platforms/windows/windows.pri src/tools/uic/cpp/cppwriteinitialization.cpp src/widgets/doc/src/widgets-and-layouts/gallery.qdoc Change-Id: I8d0834c77f350ea7540140c2c7f372814afc2d0f		2017-06-19 16:12:34 +02:00
..
externalsites	Doc: Add Creating C++ Classes to externalsites/qtcreator.qdoc	2017-03-29 12:31:13 +00:00
includes	…
includes-online	Unify license header usage.	2016-03-29 10:20:03 +00:00
template	Doc: Add macro for embedding YouTube videos	2017-03-06 13:43:58 +00:00
compat.qdocconf	Doc: Ignore QML/JavaScript parsing errors	2017-02-07 08:34:39 +00:00
config.qdocconf	Doc: Add a comment into config.qdocconf about generating internal docs	2017-02-07 08:36:00 +00:00
externalsites.qdocconf	…
fileextensions.qdocconf	Add shader files to examples documentation file list	2015-09-22 21:40:13 +00:00
html-config.qdocconf	…
html-footer-online.qdocconf	Doc: Documentation template: Bump copyright year	2017-01-26 10:56:34 +00:00
html-footer.qdocconf	Doc: Documentation template: Bump copyright year	2017-01-26 10:56:34 +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 macro for embedding YouTube videos	2017-03-06 13:43:58 +00:00
manifest-meta.qdocconf	Doc: Add highlighting for a number of examples	2017-05-17 13:42:58 +00:00
qt-cpp-defines.qdocconf	Merge remote-tracking branch 'origin/5.9' into dev	2017-06-19 16:12:34 +02: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	…
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	…
qt-module-defaults-online.qdocconf	Doc: Documentation template: Bump copyright year	2017-01-26 10:56:34 +00:00
qt-module-defaults.qdocconf	…