qt5base-lts/examples/opengl
Samuel Rødal 7b3b6b5afa Merge remote branch 'gerrit/master' into refactor
Conflicts:
	examples/opengl/cube/main.cpp
	examples/widgets/applicationicon/main.cpp
	examples/widgets/orientation/main.cpp
	src/gui/image/qicon.cpp
	src/gui/image/qimage.h
	src/gui/image/qpixmap.h
	src/gui/image/qpixmap_mac.cpp
	src/gui/kernel/qapplication.cpp
	src/gui/kernel/qpalette.cpp
	src/gui/kernel/qwidget.cpp
	src/gui/styles/qmacstyle_mac.mm
	src/gui/widgets/qmenubar.cpp
	src/gui/widgets/qslider.cpp
	src/opengl/qwindowsurface_gl.cpp
	tests/auto/qvariant/qvariant.pro
	tests/benchmarks/corelib/kernel/qobject/qobject.pro
	tests/benchmarks/gui/animation/qanimation/qanimation.pro
	tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/qgraphicsanchorlayout.pro
	tests/benchmarks/gui/graphicsview/qgraphicsitem/qgraphicsitem.pro
	tests/benchmarks/gui/graphicsview/qgraphicsscene/qgraphicsscene.pro
	tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro
	tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro
	tests/benchmarks/gui/image/qimagereader/qimagereader.pro
	tests/benchmarks/gui/itemviews/qtableview/qtableview.pro
	tests/benchmarks/gui/kernel/qapplication/qapplication.pro
	tests/benchmarks/gui/kernel/qwidget/qwidget.pro
	tests/benchmarks/gui/painting/qpainter/qpainter.pro
	tests/benchmarks/gui/painting/qtbench/qtbench.pro
	tests/benchmarks/gui/painting/qtracebench/qtracebench.pro
	tests/benchmarks/gui/text/qtext/qtext.pro

Change-Id: I4b911c795ecb29d73b6a7fd18819711b49478a30
2011-07-21 14:42:46 +02:00
..
2dpainting Merge remote branch 'staging/master' into refactor 2011-05-24 15:22:06 +02:00
cube Merge remote branch 'gerrit/master' into refactor 2011-07-21 14:42:46 +02:00
framebufferobject Squashed commit of changes from the 4.8-temp branch. 2011-05-23 14:24:07 +02:00
framebufferobject2 Merge remote branch 'staging/master' into refactor 2011-05-24 15:22:06 +02:00
grabber Merge remote branch 'staging/master' into refactor 2011-05-24 15:22:06 +02:00
hellogl Merge remote branch 'staging/master' into refactor 2011-05-24 15:22:06 +02:00
hellogl_es Merge remote-tracking branch 'base/master' into refactor 2011-06-10 13:09:57 +02:00
hellogl_es2 Merge remote-tracking branch 'base/master' into refactor 2011-06-10 13:09:57 +02:00
hellowindow Reintroduce QWindow::SurfaceType 2011-06-22 14:10:26 +02:00
overpainting Merge remote branch 'staging/master' into refactor 2011-05-24 15:22:06 +02:00
pbuffers Merge remote branch 'staging/master' into refactor 2011-05-24 15:22:06 +02:00
pbuffers2 Merge remote branch 'staging/master' into refactor 2011-05-24 15:22:06 +02:00
samplebuffers Merge remote branch 'staging/master' into refactor 2011-05-24 15:22:06 +02:00
shared Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
textures Merge remote branch 'staging/master' into refactor 2011-05-24 15:22:06 +02:00
opengl.pro Merge remote branch 'staging/master' into refactor 2011-05-24 15:22:06 +02:00
README Remove references to demos from docs. 2011-07-05 19:57:54 +02:00

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.