Jørgen Lind 00ef07fe96 Merge remote-tracking branch 'base/master' into refactor ... Conflicts: src/gui/embedded/qmousepc_qws.cpp src/gui/embedded/qwslock.cpp src/plugins/decorations/default/default.pro src/plugins/decorations/styled/styled.pro src/plugins/decorations/windows/windows.pro src/plugins/gfxdrivers/ahi/ahi.pro src/plugins/gfxdrivers/directfb/directfb.pro src/plugins/gfxdrivers/eglnullws/eglnullws.pro src/plugins/gfxdrivers/linuxfb/linuxfb.pro src/plugins/gfxdrivers/qvfb/qvfb.pro src/plugins/gfxdrivers/transformed/transformed.pro src/plugins/gfxdrivers/vnc/vnc.pro src/plugins/graphicssystems/meego/meego.pro src/plugins/graphicssystems/opengl/opengl.pro src/plugins/graphicssystems/openvg/openvg.pro src/plugins/graphicssystems/shivavg/shivavg.pro src/plugins/graphicssystems/trace/trace.pro src/plugins/kbddrivers/linuxinput/linuxinput.pro src/plugins/mousedrivers/linuxtp/linuxtp.pro src/plugins/mousedrivers/pc/pc.pro src/plugins/mousedrivers/tslib/tslib.pro src/plugins/platforms/minimal/minimal.pro tests/auto/qerrormessage/qerrormessage.pro		2011-06-01 15:34:58 +02:00
..
cube.desktop	Squashed commit of changes from the 4.8-temp branch.	2011-05-23 14:24:07 +02:00
cube.png	Squashed commit of changes from the 4.8-temp branch.	2011-05-23 14:24:07 +02:00
cube.pro	Examples: Fix compilation.	2011-05-25 09:15:14 +02:00
fshader.glsl	Squashed commit of changes from the 4.8-temp branch.	2011-05-23 14:24:07 +02:00
geometryengine.cpp	Fix for compiling and running cube example on Windows.	2011-05-25 18:55:12 +02:00
geometryengine.h	Squashed commit of changes from the 4.8-temp branch.	2011-05-23 14:24:07 +02:00
main.cpp	Examples: Fix compilation.	2011-05-25 09:15:14 +02:00
mainwidget.cpp	Fix for compiling and running cube example on Windows.	2011-05-25 18:55:12 +02:00
mainwidget.h	Fix for compiling and running cube example on Windows.	2011-05-25 18:55:12 +02:00
shaders.qrc	Squashed commit of changes from the 4.8-temp branch.	2011-05-23 14:24:07 +02:00
textures.qrc	Squashed commit of changes from the 4.8-temp branch.	2011-05-23 14:24:07 +02:00
vshader.glsl	Squashed commit of changes from the 4.8-temp branch.	2011-05-23 14:24:07 +02:00