gitorious.org Git - qt:qt.git/commit

author	Jørgen Lind <jorgen.lind@nokia.com>
	Wed, 21 Apr 2010 12:22:24 +0000 (14:22 +0200)
committer	Jørgen Lind <jorgen.lind@nokia.com>
	Wed, 21 Apr 2010 12:22:24 +0000 (14:22 +0200)
commit	51dca5f8afc3aa619a3bb62858db78a85cc3ecef
tree	dfc1fb65b6a8e5e429f1701992548f8a0425decb	tree \| snapshot
parent	6f5ad5dcab8e6f702894c4fa5c016d9837375626	commit \| diff
parent	c74dac2a0ef5d1b428c4da4e48fab05f9886233a	commit \| diff

Merge remote branch 'origin/4.7' into lighthouse

Conflicts:
configure
src/gui/kernel/qapplication.cpp
src/gui/painting/qbackingstore.cpp
src/opengl/qgl.cpp
src/opengl/qgl_p.h
src/plugins/plugins.pro
tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir
tools/tools.pro

32 files changed:

configure	diff1 \|	diff2 \|	blob \| history
src/3rdparty/webkit/WebCore/WebCore.pro	diff1 \|	diff2 \|	blob \| history
src/corelib/global/qglobal.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/global/qglobal.h	diff1 \|	diff2 \|	blob \| history
src/corelib/global/qnamespace.h	diff1 \|	diff2 \|	blob \| history
src/gui/egl/qegl.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/gui.pro	diff1 \|	diff2 \|	blob \| history
src/gui/inputmethod/inputmethod.pri	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qapplication.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qapplication_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qwidget.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qwidget_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/painting/painting.pri	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qbackingstore.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qpaintengine_raster.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qregion.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qwindowsurface.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qwindowsurface_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfont.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfont.h	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfontdatabase.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfontengine.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfontengine_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/util/util.pri	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qlinecontrol.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/widgets.pri	diff1 \|	diff2 \|	blob \| history
src/opengl/opengl.pro	diff1 \|	diff2 \|	blob \| history
src/opengl/qgl.cpp	diff1 \|	diff2 \|	blob \| history
src/opengl/qgl_p.h	diff1 \|	diff2 \|	blob \| history
src/opengl/qglpixelbuffer_p.h	diff1 \|	diff2 \|	blob \| history
src/plugins/plugins.pro	diff1 \|	diff2 \|	blob \| history
tools/tools.pro	diff1 \|	diff2 \|	blob \| history

6b46b7419a5aee9bd5fce67b7bfa8afe8e

RSS Atom

configure	diff1 \|	diff2 \|	blob \| history
src/3rdparty/webkit/WebCore/WebCore.pro	diff1 \|	diff2 \|	blob \| history
src/corelib/global/qglobal.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/global/qglobal.h	diff1 \|	diff2 \|	blob \| history
src/corelib/global/qnamespace.h	diff1 \|	diff2 \|	blob \| history
src/gui/egl/qegl.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/gui.pro	diff1 \|	diff2 \|	blob \| history
src/gui/inputmethod/inputmethod.pri	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qapplication.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qapplication_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qwidget.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qwidget_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/painting/painting.pri	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qbackingstore.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qpaintengine_raster.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qregion.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qwindowsurface.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qwindowsurface_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfont.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfont.h	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfontdatabase.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfontengine.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfontengine_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/util/util.pri	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qlinecontrol.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/widgets.pri	diff1 \|	diff2 \|	blob \| history
src/opengl/opengl.pro	diff1 \|	diff2 \|	blob \| history
src/opengl/qgl.cpp	diff1 \|	diff2 \|	blob \| history
src/opengl/qgl_p.h	diff1 \|	diff2 \|	blob \| history
src/opengl/qglpixelbuffer_p.h	diff1 \|	diff2 \|	blob \| history
src/plugins/plugins.pro	diff1 \|	diff2 \|	blob \| history
tools/tools.pro	diff1 \|	diff2 \|	blob \| history