qt5base-lts/examples/graphicsview
Samuel Rødal 2371147354 Merge remote branch 'gerrit/master' into refactor
Conflicts:
	src/gui/image/qicon.cpp
	src/gui/image/qicon.h
	src/gui/image/qicon_p.h
	src/gui/text/qfontdatabase.cpp
	src/plugins/platforms/wayland/gl_integration/qwaylandglwindowsurface.cpp
	src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.cpp
	src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.cpp
	sync.profile

Change-Id: Ie0a23a12177ff51bf562e15b2dd41f071afb19b4
2011-07-12 12:52:22 +02:00
..
anchorlayout Merge remote-tracking branch 'base/master' into refactor 2011-06-10 13:09:57 +02:00
basicgraphicslayouts Merge remote-tracking branch 'base/master' into refactor 2011-06-10 13:09:57 +02:00
boxes Merge remote-tracking branch 'base/master' into refactor 2011-06-27 12:27:54 +02:00
chip Merge remote branch 'gerrit/master' into refactor 2011-07-12 12:52:22 +02:00
collidingmice Merge remote-tracking branch 'base/master' into refactor 2011-06-10 13:09:57 +02:00
diagramscene Merge remote branch 'staging/master' into refactor 2011-05-24 15:22:06 +02:00
dragdroprobot Merge remote branch 'staging/master' into refactor 2011-05-24 15:22:06 +02:00
elasticnodes Merge remote-tracking branch 'base/master' into refactor 2011-06-10 13:09:57 +02:00
embeddeddialogs Merge remote branch 'gerrit/master' into refactor 2011-07-12 12:52:22 +02:00
flowlayout Merge remote-tracking branch 'base/master' into refactor 2011-06-10 13:09:57 +02:00
padnavigator Merge remote-tracking branch 'base/master' into refactor 2011-06-10 13:09:57 +02:00
portedasteroids Squashed commit of changes from the 4.8-temp branch. 2011-05-23 14:24:07 +02:00
portedcanvas Squashed commit of changes from the 4.8-temp branch. 2011-05-23 14:24:07 +02:00
simpleanchorlayout Merge remote-tracking branch 'base/master' into refactor 2011-06-10 13:09:57 +02:00
weatheranchorlayout Merge remote-tracking branch 'base/master' into refactor 2011-06-10 13:09:57 +02:00
graphicsview.pro Merge remote-tracking branch 'base/master' into refactor 2011-06-27 12:27:54 +02:00
README Remove references to demos from docs. 2011-07-05 19:57:54 +02:00

Qt is provided with a comprehensive canvas through the GraphicsView
classes.

These examples demonstrate the fundamental aspects of canvas programming
with Qt.


Documentation for these examples can be found via the Examples
link in the main Qt documentation.