Merge remote-tracking branch 'origin/master' into refactor
authorLars Knoll <lars.knoll@nokia.com>
Wed, 13 Jul 2011 10:22:12 +0000 (12:22 +0200)
committerLars Knoll <lars.knoll@nokia.com>
Wed, 13 Jul 2011 10:49:31 +0000 (12:49 +0200)
commita81093b9150b2f1727de6e9e77b8bdddb1c909ee
tree503ca465bbb633758c67e1f96987ed375f3c95ad
parent2770415f921d494e30e9a770c40b538d223351d6
parent718153cfa03f336be2557da058c879de63cfa792
Merge remote-tracking branch 'origin/master' into refactor

Change-Id: I53c78056abde99198ffe1c67f7f9e90b4b08051d
src/corelib/global/qglobal.h
src/widgets/graphicsview/qgraphicsscene.cpp