qtbase

History

Liang Qi dbef41f43e Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	examples/qtestlib/tutorial5/containers.cpp
	examples/widgets/tools/tools.pro
	src/corelib/io/qprocess.cpp
	src/corelib/io/qprocess_unix.cpp
	src/corelib/io/qprocess_win.cpp
	src/network/kernel/qdnslookup_unix.cpp
	src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
	src/testlib/qtestcase.cpp
	tools/configure/configureapp.cpp

Change-Id: I838ae7f082535a67a4a53aa13a21ba5580758be8

2016-05-06 15:36:44 +02:00

2dpainting

Unify license header usage.

2016-03-29 10:20:03 +00:00

contextinfo

Merge remote-tracking branch 'origin/5.6' into 5.7

2016-05-06 15:36:44 +02:00

cube

Unify license header usage.

2016-03-29 10:20:03 +00:00

doc

Unify license header usage.

2016-03-29 10:20:03 +00:00

hellogl2

Unify license header usage.

2016-03-29 10:20:03 +00:00

hellogles3

Unify license header usage.

2016-03-29 10:20:03 +00:00

hellowindow

Unify license header usage.

2016-03-29 10:20:03 +00:00

legacy

Unify license header usage.

2016-03-29 10:20:03 +00:00

paintedwindow

Unify license header usage.

2016-03-29 10:20:03 +00:00

qopenglwidget

Unify license header usage.

2016-03-29 10:20:03 +00:00

qopenglwindow

Unify license header usage.

2016-03-29 10:20:03 +00:00

textures

Unify license header usage.

2016-03-29 10:20:03 +00:00

threadedqopenglwidget

Unify license header usage.

2016-03-29 10:20:03 +00:00

opengl.pro

install the opengl legacy examples

2016-05-03 10:25:25 +00:00

README

Remove references to demos from docs.

2011-07-05 19:57:54 +02: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.