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
..
certificateinfo.cpp	QComboBox: remove currentIndexChanged(const QString&)	2020-02-19 11:32:40 +00:00
certificateinfo.h	QtNetwork (examples) - update secure socket client example	2017-09-25 13:59:50 +00:00
certificateinfo.ui	QtNetwork (examples) - update secure socket client example	2017-09-25 13:59:50 +00:00
CMakeLists.txt	Regenerate examples	2020-02-04 18:50:39 +00:00
encrypted.png	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
main.cpp	Cleanup network examples	2019-11-06 10:57:23 +01:00
securesocketclient.pro	qtlite: Skip building examples when configured with no-feature-itemviews	2018-01-12 07:58:20 +00:00
securesocketclient.qrc	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
sslclient.cpp	QAbstractSocket: Fix usage of deprecated error signal in example	2020-03-24 17:40:40 +01:00
sslclient.h	QtNetwork (examples) - update secure socket client example	2017-09-25 13:59:50 +00:00
sslclient.ui	QtNetwork (examples) - update secure socket client example	2017-09-25 13:59:50 +00:00
sslerrors.ui	Squashed commit of the changes from the mobile-examples repository	2011-05-23 14:24:07 +02:00