Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 28 May 2013 13:24:18 +0000 (15:24 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 28 May 2013 13:35:03 +0000 (15:35 +0200)
commitba0899542cf03a685335bf4e02edfb377bade224
tree554213486fd3420745da3821c3e4502e4c15830f
parent6f411ef9d460d6a4f73a455b6eec9afc2f52d305
parent43484528552cb2ba3dc1dabfcce22ed40bf4f8db
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
src/quick/doc/src/appdevguide/porting.qdoc
sync.profile

Change-Id: Iec5516c596c3eca60a3e6ceb1d45f2a7a1595c12
src/qml/qml/qqmlengine.cpp
src/qml/qml/qqmlimport.cpp
src/quick/scenegraph/coreapi/qsgnode.cpp
src/quick/util/qquickimageprovider.cpp