AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
59d1fa25d5
qt5base-lts/doc/global
History
Liang Qi 6b2535ea15 Merge remote-tracking branch 'origin/5.15' into dev 
Conflicts:
	examples/widgets/graphicsview/boxes/scene.h
	src/corelib/Qt5CoreMacros.cmake
	src/corelib/Qt6CoreMacros.cmake
	src/network/ssl/qsslsocket.cpp
	src/network/ssl/qsslsocket.h
	src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp
	src/testlib/CMakeLists.txt
	src/testlib/.prev_CMakeLists.txt
	tests/auto/corelib/tools/qscopeguard/tst_qscopeguard.cpp

Disabled building manual tests with CMake for now, because qmake
doesn't do it, and it confuses people.

Done-With: Alexandru Croitor <alexandru.croitor@qt.io>
Done-With: Volker Hilsheimer <volker.hilsheimer@qt.io>
Change-Id: I865ae347bd01f4e59f16d007b66d175a52f1f152
2020-02-13 18:31:40 +01:00
..
externalsites Doc: Fix copy-paste error in QOpenGLTexture::Target docs 2020-01-28 18:42:58 +01:00
includes Doc: Move the common documentation to a qdocinc 2019-11-18 12:34:32 +01:00
includes-online Unify license header usage. 2016-03-29 10:20:03 +00:00
template Doc: Remove background colors from simplified offline CSS 2019-03-10 20:00:11 +00:00
compat.qdocconf Doc: Ignore QML/JavaScript parsing errors 2017-02-07 08:34:39 +00:00
config.qdocconf Bump copyright year 2020-01-09 14:41:53 +02: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 2020-01-09 14:41:53 +02:00
html-footer.qdocconf Bump copyright year 2020-01-09 14:41:53 +02:00
html-header-offline.qdocconf Doc: Fixed QDoc's navigation mechanism. 2013-06-25 14:03:24 +02:00
html-header-online.qdocconf doc: Update online navigation header to match http://doc.qt.io/ 2018-10-17 16:16:28 +00:00
macros.qdocconf Merge remote-tracking branch 'origin/dev' into merge-dev 2020-01-24 13:17:33 +01:00
manifest-meta.qdocconf Doc: Remove the default list of highlighted examples 2017-11-13 08:38:51 +00:00
qt-cpp-defines.qdocconf Introduce Q_NAMESPACE_EXPORT 2019-06-28 06:47:29 +02: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 Merge remote-tracking branch 'origin/5.12' into 5.13 2019-05-09 13:06:11 +00:00
qt-html-templates-online.qdocconf Merge remote-tracking branch 'origin/5.12' into 5.13 2019-05-09 13:06:11 +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 2020-01-09 14:41:53 +02:00
qt-module-defaults.qdocconf Doc: Fixed QDoc's navigation mechanism. 2013-06-25 14:03:24 +02:00