From: Lars Knoll <lars.knoll@nokia.com>
Date: Wed, 6 Jul 2011 11:55:40 +0000 (+0200)
Subject: Merge remote branch 'gerrit/master' into refactor
X-Git-Tag: qt-v5.0.0-alpha1~222^2^2~16
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ef379f313f65f96a4cd5b422520a7ce0b18d2022;p=profile%2Fivi%2Fqtwayland.git

Merge remote branch 'gerrit/master' into refactor

Conflicts:
	config.tests/unix/opengldesktop/opengldesktop.cpp
	examples/itemviews/interview/interview.pro
	examples/mainwindows/mainwindow/mainwindow.pro
	examples/openvg/README
	examples/richtext/textedit/textedit.pro
	examples/tools/undo/undo.pro
	src/corelib/global/qglobal.h
	src/corelib/kernel/qcoreapplication.h
	src/corelib/kernel/qcoreevent.h
	src/corelib/kernel/qmetatype.h
	src/gui/kernel/qevent.cpp
	src/gui/kernel/qevent.h
	src/gui/painting/qpaintengine_raster.cpp
	src/gui/painting/qpaintengine_raster_p.h
	src/gui/text/qfontdatabase.cpp
	src/opengl/qgl.h
	src/openvg/qpaintengine_vg.cpp
	src/plugins/platforms/wayland/qwaylandwindow.cpp
	tests/auto/qmainwindow/qmainwindow.pro

Change-Id: I6bfb586740a68379bb99f4612ec993393a5f3234
---

ef379f313f65f96a4cd5b422520a7ce0b18d2022