diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2018-05-09 08:47:22 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-05-09 08:47:22 +0200 |
| commit | 57c185a5a7115304aa2db39663147ba698776cae (patch) | |
| tree | cac00545f9b6ade09be5190c65b1db081e2c404f /src/qml/qml/qqmltypeloader.cpp | |
| parent | 7be7fb0361b22cf481e8defd06e4d1dbb4bbc506 (diff) | |
| parent | 6a02e8801c71d8008c5b4db922a736c358fee00e (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I931587ab06803ed697592d10149866fbab498273
Diffstat (limited to 'src/qml/qml/qqmltypeloader.cpp')
| -rw-r--r-- | src/qml/qml/qqmltypeloader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp index e295c055e7..2ebbbf8c4a 100644 --- a/src/qml/qml/qqmltypeloader.cpp +++ b/src/qml/qml/qqmltypeloader.cpp @@ -1658,7 +1658,7 @@ QQmlRefPointer<QQmlTypeData> QQmlTypeLoader::getType(const QUrl &unNormalizedUrl (QQmlFile::urlToLocalFileOrQrc(unNormalizedUrl).isEmpty() || !QDir::isRelativePath(QQmlFile::urlToLocalFileOrQrc(unNormalizedUrl)))); - QUrl url = normalize(unNormalizedUrl); + const QUrl url = normalize(unNormalizedUrl); LockHolder<QQmlTypeLoader> holder(this); @@ -1721,7 +1721,7 @@ QQmlRefPointer<QQmlScriptBlob> QQmlTypeLoader::getScript(const QUrl &unNormalize (QQmlFile::urlToLocalFileOrQrc(unNormalizedUrl).isEmpty() || !QDir::isRelativePath(QQmlFile::urlToLocalFileOrQrc(unNormalizedUrl)))); - QUrl url = normalize(unNormalizedUrl); + const QUrl url = normalize(unNormalizedUrl); LockHolder<QQmlTypeLoader> holder(this); |