AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
e3b6f6d165
qt5base-lts/doc/global
History
Liang Qi a732576a66 Merge remote-tracking branch 'origin/5.7' into 5.8 
Conflicts:
	config.tests/win/msvc_version.cpp
	configure.pri
	mkspecs/macx-ios-clang/features/default_post.prf
	mkspecs/macx-ios-clang/features/resolve_config.prf
	mkspecs/features/uikit/default_post.prf
	mkspecs/features/uikit/resolve_config.prf
	src/corelib/io/qsettings_mac.cpp
	src/corelib/json/qjsondocument.cpp
	src/plugins/platforms/cocoa/qcocoawindow.h
	src/plugins/platforms/cocoa/qcocoawindow.mm
	src/plugins/platforms/cocoa/qnswindowdelegate.h
	src/plugins/platforms/cocoa/qnswindowdelegate.mm
	src/plugins/platforms/ios/ios.pro
	src/plugins/platforms/ios/kernel.pro
	src/plugins/platforms/ios/qiosintegration.h
	src/plugins/platforms/minimalegl/qminimaleglintegration.cpp
	tests/auto/gui/painting/qpainter/tst_qpainter.cpp
	tools/configure/environment.cpp

Change-Id: I654845e54e40f5951fb78aab349ca667e9f27843
2016-11-01 06:02:55 +01:00
..
externalsites Doc: Fix link to qsslkey-p11 example in external-resources 2016-10-19 14:03:40 +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 Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-31 09:26:35 +01:00
compat.qdocconf qdoc: Fix the qdoc \include command 2013-08-22 16:11:29 +02:00
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 Change confusing Q_DEAD_CODE_FROM_QT4_FOO define 2016-10-14 08:19:29 +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