qt5base-lts/doc/global
Qt Forward Merge Bot 8823bb8d30 Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
	examples/opengl/doc/src/cube.qdoc
	src/corelib/global/qlibraryinfo.cpp
	src/corelib/text/qbytearray_p.h
	src/corelib/text/qlocale_data_p.h
	src/corelib/time/qhijricalendar_data_p.h
	src/corelib/time/qjalalicalendar_data_p.h
	src/corelib/time/qromancalendar_data_p.h
	src/network/ssl/qsslcertificate.h
	src/widgets/doc/src/graphicsview.qdoc
	src/widgets/widgets/qcombobox.cpp
	src/widgets/widgets/qcombobox.h
	tests/auto/corelib/tools/qscopeguard/tst_qscopeguard.cpp
	tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
	tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro
	tests/manual/diaglib/debugproxystyle.cpp
	tests/manual/diaglib/qwidgetdump.cpp
	tests/manual/diaglib/qwindowdump.cpp
	tests/manual/diaglib/textdump.cpp
	util/locale_database/cldr2qlocalexml.py
	util/locale_database/qlocalexml.py
	util/locale_database/qlocalexml2cpp.py

Resolution of util/locale_database/ are based on:
https://codereview.qt-project.org/c/qt/qtbase/+/294250
and src/corelib/{text,time}/*_data_p.h were then regenerated by
running those scripts.

Updated CMakeLists.txt in each of
	tests/auto/corelib/serialization/qcborstreamreader/
	tests/auto/corelib/serialization/qcborvalue/
	tests/auto/gui/kernel/
and generated new ones in each of
	tests/auto/gui/kernel/qaddpostroutine/
	tests/auto/gui/kernel/qhighdpiscaling/
	tests/libfuzzer/corelib/text/qregularexpression/optimize/
	tests/libfuzzer/gui/painting/qcolorspace/fromiccprofile/
	tests/libfuzzer/gui/text/qtextdocument/sethtml/
	tests/libfuzzer/gui/text/qtextdocument/setmarkdown/
	tests/libfuzzer/gui/text/qtextlayout/beginlayout/
by running util/cmake/pro2cmake.py on their changed .pro files.

Changed target name in
	tests/auto/gui/kernel/qaction/qaction.pro
	tests/auto/gui/kernel/qaction/qactiongroup.pro
	tests/auto/gui/kernel/qshortcut/qshortcut.pro
to ensure unique target names for CMake

Changed tst_QComboBox::currentIndex to not test the
currentIndexChanged(QString), as that one does not exist in Qt 6
anymore.

Change-Id: I9a85705484855ae1dc874a81f49d27a50b0dcff7
2020-04-08 20:11:39 +02: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
template Doc: Adjust offline style for the litehtml rendering engine 2020-03-26 15:28:31 +01:00
compat.qdocconf
config.qdocconf Bump copyright year 2020-01-09 14:41:53 +02:00
externalsites.qdocconf
fileextensions.qdocconf
html-config.qdocconf
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
html-header-online.qdocconf
macros.qdocconf Merge remote-tracking branch 'origin/dev' into merge-dev 2020-01-24 13:17:33 +01:00
manifest-meta.qdocconf Examples: update examples list for Android 2020-03-03 19:35:34 +02:00
qt-cpp-defines.qdocconf Introduce Q_NAMESPACE_EXPORT 2019-06-28 06:47:29 +02:00
qt-html-templates-offline-simple.qdocconf Doc: Adjust offline style for the litehtml rendering engine 2020-03-26 15:28:31 +01: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
qt-module-defaults-online-commercial.qdocconf
qt-module-defaults-online.qdocconf Bump copyright year 2020-01-09 14:41:53 +02:00
qt-module-defaults.qdocconf