diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-04-17 16:35:19 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2012-04-17 22:32:42 +0200 |
| commit | 7d3a56f3cf717a06823c33b031ea4f590e14002d (patch) | |
| tree | b5d2845e8353ba2de3028a9f32749ca622e115da /modules | |
| parent | f92c3aecd08eef468f9a47f2e970f22beecc8216 (diff) | |
| parent | e5f45d9b57bb0542ec47e5a8a4e57388b6d59d35 (diff) | |
Merge remote-tracking branch 'origin/api_changes'
Change-Id: I39905acde16ba6bb0ba39401cb73082a73dd9167
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/qt_declarative.pri | 2 | ||||
| -rw-r--r-- | modules/qt_qml.pri | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/qt_declarative.pri b/modules/qt_declarative.pri index 619f562f49..d6827ab8ab 100644 --- a/modules/qt_declarative.pri +++ b/modules/qt_declarative.pri @@ -85,7 +85,7 @@ QT.declarative.DEFINES = \ QDeclarativeFontLoader=QQuickFontLoader\ QDeclarativeFontValueType=QQmlFontValueType\ QDeclarativeGuard=QQmlGuard\ - QDeclarativeImageProvider=QQmlImageProvider\ + QDeclarativeImageProvider=QQuickImageProvider\ QDeclarativeImports=QQmlImports\ QDeclarativeIncubationController=QQmlIncubationController\ QDeclarativeIncubator=QQmlIncubator\ diff --git a/modules/qt_qml.pri b/modules/qt_qml.pri index 82e70e3e93..3a6318e37f 100644 --- a/modules/qt_qml.pri +++ b/modules/qt_qml.pri @@ -12,6 +12,6 @@ QT.qml.libs = $$QT_MODULE_LIB_BASE QT.qml.plugins = $$QT_MODULE_PLUGIN_BASE QT.qml.imports = $$QT_MODULE_IMPORT_BASE QT.qml.depends = gui network xmlpatterns -QT.qml.DEFINES = QT_QML_LIB +QT.qml.DEFINES = QT_QML_LIB QQmlImageProvider=QQuickImageProvider QT_CONFIG += qml |