qt5base-lts/examples/opengl
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
..
2dpainting Move QOpenGLWidget from QtOpenGL to its own module 2020-02-18 09:22:51 +01:00
computegles31 Post Merge Fixes 2020-01-24 12:29:18 +00:00
contextinfo Move QOpenGLShaderProgram from QtGui to QtOpenGL 2020-02-20 16:11:02 +01:00
cube Move QOpenGLWidget from QtOpenGL to its own module 2020-02-18 09:22:51 +01:00
doc Merge remote-tracking branch 'origin/5.15' into dev 2020-04-08 20:11:39 +02:00
hellogl2 Move QOpenGLWidget from QtOpenGL to its own module 2020-02-18 09:22:51 +01:00
hellogles3 Post Merge Fixes 2020-01-24 12:29:18 +00:00
hellowindow Move QOpenGLShaderProgram from QtGui to QtOpenGL 2020-02-20 16:11:02 +01:00
openglwindow Post-merge fixes 2020-01-30 20:45:08 +00:00
paintedwindow Merge remote-tracking branch 'origin/5.15' into dev 2020-03-11 15:34:21 +01:00
qopenglwidget Move QOpenGLWidget from QtOpenGL to its own module 2020-02-18 09:22:51 +01:00
qopenglwindow Merge remote-tracking branch 'origin/5.15' into dev 2020-03-11 15:34:21 +01:00
textures Move QOpenGLWidget from QtOpenGL to its own module 2020-02-18 09:22:51 +01:00
threadedqopenglwidget Move QOpenGLWidget from QtOpenGL to its own module 2020-02-18 09:22:51 +01:00
CMakeLists.txt Post-merge fixes 2020-01-30 20:45:08 +00:00
opengl.pro Remove legacy OpenGL examples 2020-02-21 09:01:08 +00:00
README

Qt provides support for integration with OpenGL implementations on all
platforms, giving developers the opportunity to display hardware accelerated
3D graphics alongside a more conventional user interface.

These examples demonstrate the basic techniques used to take advantage of
OpenGL in Qt applications.


Documentation for these examples can be found via the Examples
link in the main Qt documentation.