Remove uses of QtGui symbols in QQmlEngine.
authorMatthew Vogt <matthew.vogt@nokia.com>
Mon, 5 Mar 2012 07:01:33 +0000 (17:01 +1000)
committerQt by Nokia <qt-info@nokia.com>
Wed, 7 Mar 2012 01:33:24 +0000 (02:33 +0100)
commit3bc907d155034fe64efc8cb6056b48f0c6401bfb
treea1fb0ddfa50f136e66a177e3147546690a0c429e
parentcd0c9ae4ccc43503b6d8fb93bc87092cfa328adc
Remove uses of QtGui symbols in QQmlEngine.

Move the code dealing with QImage and QPixmap out of QQmlEngine
and into the QtQuick library.  QQmlEngine remains the owner
of image provider resources, but does not use them directly.

Change-Id: I52083581394d9c308db446372883eb7479ccf807
Reviewed-by: Martin Jones <martin.jones@nokia.com>
17 files changed:
bin/rename-qtdeclarative-symbols.sh
src/qml/qml/qml.pri
src/qml/qml/qqmlengine.cpp
src/qml/qml/qqmlengine.h
src/qml/qml/qqmlengine_p.h
src/quick/scenegraph/qsgcontext.cpp
src/quick/scenegraph/qsgcontextplugin_p.h
src/quick/util/qquickimageprovider.cpp [moved from src/qml/qml/qqmlimageprovider.cpp with 91% similarity]
src/quick/util/qquickimageprovider.h [moved from src/qml/qml/qqmlimageprovider.h with 85% similarity]
src/quick/util/qquickpixmapcache.cpp
src/quick/util/qquickpixmapcache_p.h
src/quick/util/util.pri
tests/auto/qml/qml.pro
tests/auto/quick/qquickimageprovider/qquickimageprovider.pro [moved from tests/auto/qml/qqmlimageprovider/qqmlimageprovider.pro with 66% similarity]
tests/auto/quick/qquickimageprovider/tst_qquickimageprovider.cpp [moved from tests/auto/qml/qqmlimageprovider/tst_qqmlimageprovider.cpp with 87% similarity]
tests/auto/quick/qquickpixmapcache/tst_qquickpixmapcache.cpp
tests/auto/quick/quick.pro