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
..
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	Doc: Added missing license headers for documentation and examples.	2011-07-20 15:12:53 +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