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
..
files	Remove more references to demos.	2011-07-08 15:36:26 +02:00
main.cpp	Remove more references to demos.	2011-07-08 15:36:26 +02:00
styleexample.pro	Merge remote branch 'gerrit/master' into refactor	2011-07-12 12:52:22 +02:00
styleexample.qrc	Remove more references to demos.	2011-07-08 15:36:26 +02:00
stylewidget.cpp	Remove more references to demos.	2011-07-08 15:36:26 +02:00
stylewidget.h	Remove more references to demos.	2011-07-08 15:36:26 +02:00
stylewidget.ui	Remove more references to demos.	2011-07-08 15:36:26 +02:00