Fix loading QML caches for qrc:/// urls

Running examples/quick/window/window produces debug messages:
"QML source file has moved to a different location."
This is because QQmlFile::urlToLocalFileOrQrc(const QString &) overload
is incompatible with QQmlFile::urlToLocalFileOrQrc(const QUrl &) when it
deals with qrc:/// urls. For example it returns ":///window/window.qml"
while the QUrl overload returns ":/window/window.qml". Thus the comparison
of source paths in CompilationUnit::loadFromDisk() fails.

Fix the incompatibility and add a test.

Change-Id: I20449b8cf13d715d88860f2cd413ab39c893f3ef
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

4 files changed, 70 insertions, 0 deletions

diff --git a/src/qml/qml/qqmlfile.cpp b/src/qml/qml/qqmlfile.cpp
index 4e4db086b0..93c3e8e00c 100644
--- a/src/qml/qml/qqmlfile.cpp
+++ b/src/qml/qml/qqmlfile.cpp
@@ -603,6 +603,12 @@ empty string.
 */
 QString QQmlFile::urlToLocalFileOrQrc(const QString& url)
 {
+    if (url.startsWith(QLatin1String("qrc://"), Qt::CaseInsensitive)) {
+        if (url.length() > 6)
+            return QLatin1Char(':') + url.midRef(6);
+        return QString();
+    }
+
     if (url.startsWith(QLatin1String("qrc:"), Qt::CaseInsensitive)) {
         if (url.length() > 4)
             return QLatin1Char(':') + url.midRef(4);
diff --git a/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro
index 59566ad927..12a8bd3829 100644
--- a/tests/auto/qml/qml.pro
+++ b/tests/auto/qml/qml.pro
@@ -7,6 +7,7 @@ PUBLICTESTS += \
     parserstress \
     qjsvalueiterator \
     qjsonbinding \
+    qqmlfile \
 
 !boot2qt {
 PUBLICTESTS += \
diff --git a/tests/auto/qml/qqmlfile/qqmlfile.pro b/tests/auto/qml/qqmlfile/qqmlfile.pro
new file mode 100644
index 0000000000..ab66792445
--- /dev/null
+++ b/tests/auto/qml/qqmlfile/qqmlfile.pro
@@ -0,0 +1,5 @@
+CONFIG   += testcase
+TARGET = tst_qqmlfile
+SOURCES += tst_qqmlfile.cpp
+macos:CONFIG -= app_bundle
+QT       += qml testlib
diff --git a/tests/auto/qml/qqmlfile/tst_qqmlfile.cpp b/tests/auto/qml/qqmlfile/tst_qqmlfile.cpp
new file mode 100644
index 0000000000..a1c8daddcf
--- /dev/null
+++ b/tests/auto/qml/qqmlfile/tst_qqmlfile.cpp
@@ -0,0 +1,58 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore>
+#include <QtTest>
+#include <QQmlFile>
+
+class tst_qqmlfile : public QObject
+{
+    Q_OBJECT
+
+public:
+    tst_qqmlfile() {}
+
+private Q_SLOTS:
+    void urlToLocalFileOrQrcOverloads();
+};
+
+
+void tst_qqmlfile::urlToLocalFileOrQrcOverloads()
+{
+    const QString urlString = QStringLiteral("qrc:///example.qml");
+    const QUrl url(urlString);
+    const QString pathForUrlString = QQmlFile::urlToLocalFileOrQrc(urlString);
+    const QString pathForUrl = QQmlFile::urlToLocalFileOrQrc(url);
+
+    QCOMPARE(pathForUrlString, pathForUrl);
+    QCOMPARE(pathForUrlString, QStringLiteral(":/example.qml"));
+}
+
+QTEST_GUILESS_MAIN(tst_qqmlfile)
+
+#include "tst_qqmlfile.moc"