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
..
chip.cpp	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
chip.h	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
chiptester.cpp	Remove more references to demos.	2011-07-08 15:36:26 +02:00
chiptester.h	Merge remote branch 'staging/master' into refactor	2011-05-24 15:22:06 +02:00
chiptester.pri	Tests: Compile.	2011-05-23 16:49:06 +02:00
images.qrc	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
qt4logo.png	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00