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
..
images	Purge sRGB chunks from PNGs in tests.	2016-03-29 08:39:43 +00:00
scripts	Raster painting: fix dashing for separate lines	2020-03-27 12:31:01 +01:00
.gitignore	Moved integrationtests/* into other/	2011-11-30 09:30:22 +01:00
CMakeLists.txt	Regenerate projects one last time before merge	2020-02-12 17:30:49 +00:00
images.qrc	Moved integrationtests/* into other/	2011-11-30 09:30:22 +01:00
lancelot.pro	Move QOpenGLPaintEngine and related classes from QtGui to QtOpenGL	2020-01-22 09:40:59 +01:00
paintcommands.cpp	Add default arguments to QPainterPath methods using transform	2020-03-06 21:09:48 +01:00
paintcommands.h	Add testing of fillRect() to QPainter lancelot test	2019-10-16 06:31:59 +00:00
tst_lancelot.cpp	Use Qt::SplitBehavior in preference to QString::SplitBehavior	2020-02-28 15:37:11 +01:00