Jørgen Lind 18a3f6169b Merge remote-tracking branch 'base/master' into refactor ... Conflicts: demos/demos.pro demos/embedded/digiflip/digiflip.pro examples/examples.pro examples/graphicsview/embeddeddialogs/embeddeddialogs.pro src/gui/kernel/qplatformglcontext_qpa.cpp src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.cpp src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp src/plugins/platforms/wayland/qwaylanddisplay.cpp src/plugins/platforms/wayland/qwaylandwindow.cpp Change-Id: I2a4ec9e2ca9c9aa9d57b55f98985e810b77bb745		2011-06-27 12:27:54 +02:00
..
3rdparty	Move all other demos in qtbase to examples.	2011-06-24 16:47:24 +02:00
basic.fsh	Move all other demos in qtbase to examples.	2011-06-24 16:47:24 +02:00
basic.vsh	Move all other demos in qtbase to examples.	2011-06-24 16:47:24 +02:00
boxes.pro	Merge remote-tracking branch 'base/master' into refactor	2011-06-27 12:27:54 +02:00
boxes.qrc	Move all other demos in qtbase to examples.	2011-06-24 16:47:24 +02:00
cubemap_negx.jpg	Move all other demos in qtbase to examples.	2011-06-24 16:47:24 +02:00
cubemap_negy.jpg	Move all other demos in qtbase to examples.	2011-06-24 16:47:24 +02:00
cubemap_negz.jpg	Move all other demos in qtbase to examples.	2011-06-24 16:47:24 +02:00
cubemap_posx.jpg	Move all other demos in qtbase to examples.	2011-06-24 16:47:24 +02:00
cubemap_posy.jpg	Move all other demos in qtbase to examples.	2011-06-24 16:47:24 +02:00
cubemap_posz.jpg	Move all other demos in qtbase to examples.	2011-06-24 16:47:24 +02:00
dotted.fsh	Move all other demos in qtbase to examples.	2011-06-24 16:47:24 +02:00
fresnel.fsh	Move all other demos in qtbase to examples.	2011-06-24 16:47:24 +02:00
glass.fsh	Move all other demos in qtbase to examples.	2011-06-24 16:47:24 +02:00
glbuffers.cpp	Move all other demos in qtbase to examples.	2011-06-24 16:47:24 +02:00
glbuffers.h	Merge remote-tracking branch 'base/master' into refactor	2011-06-27 12:27:54 +02:00
glextensions.cpp	Move all other demos in qtbase to examples.	2011-06-24 16:47:24 +02:00
glextensions.h	Move all other demos in qtbase to examples.	2011-06-24 16:47:24 +02:00
gltrianglemesh.h	Merge remote-tracking branch 'base/master' into refactor	2011-06-27 12:27:54 +02:00
granite.fsh	Move all other demos in qtbase to examples.	2011-06-24 16:47:24 +02:00
main.cpp	Merge remote-tracking branch 'base/master' into refactor	2011-06-27 12:27:54 +02:00
marble.fsh	Move all other demos in qtbase to examples.	2011-06-24 16:47:24 +02:00
parameters.par	Move all other demos in qtbase to examples.	2011-06-24 16:47:24 +02:00
qt-logo.jpg	Move all other demos in qtbase to examples.	2011-06-24 16:47:24 +02:00
qt-logo.png	Move all other demos in qtbase to examples.	2011-06-24 16:47:24 +02:00
qtbox.cpp	Move all other demos in qtbase to examples.	2011-06-24 16:47:24 +02:00
qtbox.h	Merge remote-tracking branch 'base/master' into refactor	2011-06-27 12:27:54 +02:00
reflection.fsh	Move all other demos in qtbase to examples.	2011-06-24 16:47:24 +02:00
refraction.fsh	Move all other demos in qtbase to examples.	2011-06-24 16:47:24 +02:00
roundedbox.cpp	Move all other demos in qtbase to examples.	2011-06-24 16:47:24 +02:00
roundedbox.h	Merge remote-tracking branch 'base/master' into refactor	2011-06-27 12:27:54 +02:00
scene.cpp	Move all other demos in qtbase to examples.	2011-06-24 16:47:24 +02:00
scene.h	Merge remote-tracking branch 'base/master' into refactor	2011-06-27 12:27:54 +02:00
smiley.png	Move all other demos in qtbase to examples.	2011-06-24 16:47:24 +02:00
square.jpg	Move all other demos in qtbase to examples.	2011-06-24 16:47:24 +02:00
trackball.cpp	Move all other demos in qtbase to examples.	2011-06-24 16:47:24 +02:00
trackball.h	Merge remote-tracking branch 'base/master' into refactor	2011-06-27 12:27:54 +02:00
wood.fsh	Move all other demos in qtbase to examples.	2011-06-24 16:47:24 +02:00