Gunnar Sletta 04d0a9626c Merge branch 'master' into refactor ... Conflicts: src/gui/kernel/qapplication_qpa.cpp src/gui/kernel/qcursor_qpa.cpp src/gui/kernel/qwindowsysteminterface_qpa.cpp src/gui/kernel/qwindowsysteminterface_qpa.h src/gui/kernel/qwindowsysteminterface_qpa_p.h src/gui/text/qtextcontrol.cpp src/plugins/platforms/wayland/wayland.pro src/widgets/accessible/qaccessible2.h src/widgets/widgets/qwidgetlinecontrol_p.h Change-Id: I5e6f4eb184159dccc67e8f13673edb884d179c74		2011-08-25 12:48:52 +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	Merge remote-tracking branch 'base/master' into refactor	2011-06-10 13:09:57 +02:00
fshader.glsl	Squashed commit of changes from the 4.8-temp branch.	2011-05-23 14:24:07 +02:00
geometryengine.cpp	Doc: Added missing license headers for documentation and examples.	2011-07-20 15:12:53 +02:00
geometryengine.h	Doc: Added missing license headers for documentation and examples.	2011-07-20 15:12:53 +02:00
main.cpp	Merge remote branch 'gerrit/master' into refactor	2011-07-21 14:42:46 +02:00
mainwidget.cpp	Doc: Added missing license headers for documentation and examples.	2011-07-20 15:12:53 +02:00
mainwidget.h	Support -qtnamespace and -qtlibinfix in qtbase examples	2011-08-08 16:41:27 +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