Merge branch 'refactor'
authorGunnar Sletta <gunnar.sletta@nokia.com>
Tue, 13 Sep 2011 06:54:45 +0000 (08:54 +0200)
committerGunnar Sletta <gunnar.sletta@nokia.com>
Tue, 13 Sep 2011 06:54:45 +0000 (08:54 +0200)
commitb62bd0584a7872b6917917009b707785b3abd077
tree9981f274712c098cabbff0c4667672a3934e5393
parent5e10745dca1d10025404a9f268f03ae697fb10cc
parent97baad65f65783d2b5ff938f6217aec9434f2e5f
Merge branch 'refactor'

Conflicts:
mkspecs/qws/linux-lsb-g++/qmake.conf
src/gui/image/qpixmap_mac.cpp
src/gui/painting/qpaintengine_x11.cpp
src/gui/painting/qtessellator.cpp
src/gui/text/qfontengine_qws.cpp
src/gui/text/qfontengine_x11.cpp
src/gui/widgets/qlinecontrol.cpp
src/opengl/qgl.h
src/opengl/qgl_x11egl.cpp
src/plugins/plugins.pro

Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310
20 files changed:
src/corelib/global/qglobal.h
src/corelib/io/qdir.cpp
src/gui/kernel/qkeysequence.cpp
src/gui/painting/qpaintengine_raster.cpp
src/gui/text/qfontengine.cpp
src/gui/text/qfontengine_qpa.cpp
src/gui/text/qtextengine.cpp
src/gui/text/qtexthtmlparser.cpp
src/plugins/platforms/directfb/qdirectfbglcontext.cpp
src/plugins/plugins.pro
src/v8/v8.pri
src/widgets/platforms/mac/qfontengine_mac.mm
src/widgets/platforms/s60/qfontengine_s60.cpp
src/widgets/platforms/win/qcursor_win.cpp
src/widgets/platforms/win/qfontengine_win.cpp
src/widgets/styles/qcommonstyle.cpp
src/widgets/widgets/qtabbar.cpp
tests/auto/corelib/kernel/qitemmodel/tst_qitemmodel.cpp
tests/auto/gui/kernel/qshortcut/tst_qshortcut.cpp
tools/configure/configureapp.cpp