Liang Qi 6a772fd201 Merge remote-tracking branch 'origin/5.9' into dev ... Conflicts: .qmake.conf mkspecs/common/msvc-desktop.conf mkspecs/win32-g++/qmake.conf mkspecs/win32-icc/qmake.conf src/platformsupport/fontdatabases/mac/coretext.pri src/plugins/platforms/cocoa/qcocoawindow.h src/plugins/platforms/cocoa/qcocoawindow.mm Change-Id: I74a6f7705c9547ed8bbac7260eb4645543e32655		2017-05-29 10:54:41 +02:00
..
externalsites	Doc: Add Creating C++ Classes to externalsites/qtcreator.qdoc	2017-03-29 12:31:13 +00:00
includes	…
includes-online	…
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	…
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	…
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-05-29 10:54:41 +02:00
qt-html-templates-offline-simple.qdocconf	…
qt-html-templates-offline.qdocconf	…
qt-html-templates-online.qdocconf	…
qt-module-defaults-offline.qdocconf	…
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	…