diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-20 16:19:05 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-20 16:19:05 +0200 |
| commit | 2402d3a303f712f4402cc258fcd7c8983227ea31 (patch) | |
| tree | 3e79afdfd1e4268adecf4ad98bb867025048bd61 /src/qml/qml/qqmlengine.cpp | |
| parent | 1037a7f7123dcf9f7b48a6a74118f746ddcbf3d5 (diff) | |
| parent | 5d4b006181d009e6245d5d38c7798603ddcab06a (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I5cc2cacd26004ba18f0c6214759f5e073b5c6cfb
Diffstat (limited to 'src/qml/qml/qqmlengine.cpp')
| -rw-r--r-- | src/qml/qml/qqmlengine.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index a304365dfe..673fbfefbb 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -1065,7 +1065,7 @@ QQmlImageProviderBase *QQmlEngine::imageProvider(const QString &providerId) cons { Q_D(const QQmlEngine); QMutexLocker locker(&d->mutex); - return d->imageProviders.value(providerId).data(); + return d->imageProviders.value(providerId.toLower()).data(); } /*! @@ -1077,7 +1077,7 @@ void QQmlEngine::removeImageProvider(const QString &providerId) { Q_D(QQmlEngine); QMutexLocker locker(&d->mutex); - d->imageProviders.take(providerId); + d->imageProviders.take(providerId.toLower()); } /*! |