diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-07 09:56:50 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-07 10:09:13 (GMT) |
| commit | 91337cb62bca653c9df7e8b8f43f451facc1efb8 (patch) | |
| tree | 9e401ecc08a82360701ffe99f52b0049a99acb4b /src/declarative | |
| parent | 070a3dbbb368f3e1b817a5ecff15127302458e7a (diff) | |
| download | Qt-91337cb62bca653c9df7e8b8f43f451facc1efb8.zip Qt-91337cb62bca653c9df7e8b8f43f451facc1efb8.tar.gz Qt-91337cb62bca653c9df7e8b8f43f451facc1efb8.tar.bz2 | |
QtDeclarative: RFC 3986 requires schemes to be considered case-insensitively
Reviewed-By: Alan Alpert
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/qml/qdeclarativecompositetypemanager.cpp | 2 | ||||
| -rw-r--r-- | src/declarative/qml/qdeclarativeengine.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativecompositetypemanager.cpp b/src/declarative/qml/qdeclarativecompositetypemanager.cpp index 0eb7e1b..b0c9a43 100644 --- a/src/declarative/qml/qdeclarativecompositetypemanager.cpp +++ b/src/declarative/qml/qdeclarativecompositetypemanager.cpp @@ -338,7 +338,7 @@ void QDeclarativeCompositeTypeManager::resourceReplyFinished() // WARNING, there is a copy of this function in qdeclarativeengine.cpp static QString toLocalFileOrQrc(const QUrl& url) { - if (url.scheme() == QLatin1String("qrc")) { + if (url.scheme().compare(QLatin1String("qrc"), Qt::CaseInsensitive) == 0) { if (url.authority().isEmpty()) return QLatin1Char(':') + url.path(); return QString(); diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index 0ee6dfe..1387432 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -1526,7 +1526,7 @@ QVariant QDeclarativeEnginePrivate::scriptValueToVariant(const QScriptValue &val // WARNING, there is a copy of this function in qdeclarativecompositetypemanager.cpp static QString toLocalFileOrQrc(const QUrl& url) { - if (url.scheme() == QLatin1String("qrc")) { + if (url.scheme().compare(QLatin1String("qrc"), Qt::CaseInsensitive) == 0) { if (url.authority().isEmpty()) return QLatin1Char(':') + url.path(); return QString(); |