Merge branch 'master' into refactor
authorGunnar Sletta <gunnar.sletta@nokia.com>
Mon, 12 Sep 2011 05:49:03 +0000 (07:49 +0200)
committerGunnar Sletta <gunnar.sletta@nokia.com>
Mon, 12 Sep 2011 05:49:03 +0000 (07:49 +0200)
commita9ac6da893ac10ce160c9eb80141508881cd71e2
tree0e74067407612d44ad07ff74cb7be6d444ee28c5
parent8eb5ba3b9cb1e8e07f28a3153672a946b2d82fd9
parent687461627310e8b781da15d1a907c35bd8ffea6e
Merge branch 'master' into refactor

Conflicts:
src/3rdparty/v8
src/gui/text/qfont_qpa.cpp
src/gui/widgets/qlinecontrol.cpp
src/plugins/platforms/fontdatabases/fontconfig/qfontconfigdatabase.cpp
tests/auto/gui.pro
tests/auto/network.pro
tests/auto/qstring/tst_qstring.cpp

Change-Id: Id118c172645303ccf06a207050d5bf1462ff57fe
configure
src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
tests/auto/corelib/global/qglobal/tst_qglobal.cpp
tests/auto/dbus/dbus.pro
tests/auto/gui.pro
tests/auto/network.pro
tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp
tools/configure/configureapp.cpp