AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
ed245f3e70
qt5base-lts/doc/global
History
Liang Qi 305dd1b61f Merge remote-tracking branch 'origin/5.9' into 5.11 
Conflicts:
	.qmake.conf
	src/corelib/animation/qvariantanimation.cpp
	src/corelib/global/qglobal.cpp
	src/corelib/global/qlogging.cpp
	src/corelib/io/qprocess_win.cpp
	src/corelib/json/qjsonarray.cpp
	src/corelib/tools/qsimd_p.h
	src/corelib/tools/qtimezoneprivate_p.h
	src/corelib/xml/qxmlstream_p.h
	src/gui/kernel/qsimpledrag.cpp
	src/gui/kernel/qsimpledrag_p.h
	src/plugins/generic/generic.pro
	src/plugins/platforms/cocoa/qcocoamenu.mm
	src/widgets/styles/qmacstyle_mac.mm
	tests/auto/concurrent/qtconcurrentmap/BLACKLIST
	tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
	tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
	tests/auto/gui/kernel/qwindow/BLACKLIST
	tests/auto/widgets/dialogs/qmessagebox/BLACKLIST

Change-Id: I508d686cf20f7f8cc6a7119b9bc7c3bbb505c58e
2018-02-14 12:51:24 +01:00
..
externalsites Doc: Update Qt Creator Manual link targets to match version 4.4 2017-08-23 12:18:14 +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 Doc: Add styling for function groups 2017-08-15 09:40:13 +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 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 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: Mention exact Qt version the third party attributions apply to 2018-01-19 06:30:06 +00:00
manifest-meta.qdocconf Doc: Remove the default list of highlighted examples 2017-11-13 08:38:51 +00:00
qt-cpp-defines.qdocconf qdoc: Remove __cplusplus from the defines list 2018-02-03 12:46:34 +00:00
qt-html-templates-offline-simple.qdocconf Fix jumping to anchors with offline style 2017-08-29 11:25:27 +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 Doc: Documentation template: Bump copyright year 2017-01-26 10:56:34 +00:00
qt-module-defaults.qdocconf