URLRequestQrcJobQt: remove ineffective URL formatting options

Remove strange options for call to QUrl::path and add test for "qrc" protocol.

Change-Id: I6528d858b7661832852c333a7f932d4714f953f2
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

6 files changed, 43 insertions, 1 deletions

diff --git a/src/core/url_request_qrc_job_qt.cpp b/src/core/url_request_qrc_job_qt.cpp
index b4e960921..a2712653d 100644
--- a/src/core/url_request_qrc_job_qt.cpp
+++ b/src/core/url_request_qrc_job_qt.cpp
@@ -112,7 +112,7 @@ int URLRequestQrcJobQt::ReadRawData(IOBuffer *buf, int bufSize)
 void URLRequestQrcJobQt::startGetHead()
 {
     // Get qrc file path.
-    QString qrcFilePath = ':' + toQt(request_->url()).path(QUrl::RemovePath | QUrl::RemoveQuery);
+    QString qrcFilePath = ':' + toQt(request_->url()).path();
     m_file.setFileName(qrcFilePath);
     QFileInfo qrcFileInfo(m_file);
     // Get qrc file mime type.
diff --git a/tests/auto/widgets/qwebenginepage/resources/bar.txt b/tests/auto/widgets/qwebenginepage/resources/bar.txt
new file mode 100644
index 000000000..5716ca598
--- /dev/null
+++ b/tests/auto/widgets/qwebenginepage/resources/bar.txt
@@ -0,0 +1 @@
+bar
diff --git a/tests/auto/widgets/qwebenginepage/resources/foo.txt b/tests/auto/widgets/qwebenginepage/resources/foo.txt
new file mode 100644
index 000000000..257cc5642
--- /dev/null
+++ b/tests/auto/widgets/qwebenginepage/resources/foo.txt
@@ -0,0 +1 @@
+foo
diff --git a/tests/auto/widgets/qwebenginepage/resources/path with spaces.txt b/tests/auto/widgets/qwebenginepage/resources/path with spaces.txt
new file mode 100644
index 000000000..4f79cb0dd
--- /dev/null
+++ b/tests/auto/widgets/qwebenginepage/resources/path with spaces.txt
@@ -0,0 +1 @@
+contents with spaces
diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
index bef77d3f1..e3d6a7435 100644
--- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
+++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
@@ -197,6 +197,7 @@ private Q_SLOTS:
     void loadFinishedAfterNotFoundError();
     void loadInSignalHandlers_data();
     void loadInSignalHandlers();
+    void loadFromQrc();
 
     void restoreHistory();
     void toPlainTextLoadFinishedRace_data();
@@ -4037,6 +4038,41 @@ void tst_QWebEnginePage::loadInSignalHandlers()
     QCOMPARE(m_page->url(), urlForSetter);
 }
 
+void tst_QWebEnginePage::loadFromQrc()
+{
+    QWebEnginePage page;
+    QSignalSpy spy(&page, &QWebEnginePage::loadFinished);
+
+    // Standard case.
+    page.load(QStringLiteral("qrc:///resources/foo.txt"));
+    QTRY_COMPARE(spy.count(), 1);
+    QCOMPARE(spy.takeFirst().value(0).toBool(), true);
+    QCOMPARE(toPlainTextSync(&page), QStringLiteral("foo\n"));
+
+    // Query and fragment parts are ignored.
+    page.load(QStringLiteral("qrc:///resources/bar.txt?foo=1#bar"));
+    QTRY_COMPARE(spy.count(), 1);
+    QCOMPARE(spy.takeFirst().value(0).toBool(), true);
+    QCOMPARE(toPlainTextSync(&page), QStringLiteral("bar\n"));
+
+    // Literal spaces are OK.
+    page.load(QStringLiteral("qrc:///resources/path with spaces.txt"));
+    QTRY_COMPARE(spy.count(), 1);
+    QCOMPARE(spy.takeFirst().value(0).toBool(), true);
+    QCOMPARE(toPlainTextSync(&page), QStringLiteral("contents with spaces\n"));
+
+    // Escaped spaces are OK too.
+    page.load(QStringLiteral("qrc:///resources/path%20with%20spaces.txt"));
+    QTRY_COMPARE(spy.count(), 1);
+    QCOMPARE(spy.takeFirst().value(0).toBool(), true);
+    QCOMPARE(toPlainTextSync(&page), QStringLiteral("contents with spaces\n"));
+
+    // Resource not found, loading fails.
+    page.load(QStringLiteral("qrc:///nope"));
+    QTRY_COMPARE(spy.count(), 1);
+    QCOMPARE(spy.takeFirst().value(0).toBool(), false);
+}
+
 void tst_QWebEnginePage::restoreHistory()
 {
     QWebChannel channel;
diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.qrc b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.qrc
index 91adeb694..1226e367d 100644
--- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.qrc
+++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.qrc
@@ -18,5 +18,8 @@
     <file>resources/test2.html</file>
     <file>resources/testiframe.html</file>
     <file>resources/testiframe2.html</file>
+    <file>resources/foo.txt</file>
+    <file>resources/bar.txt</file>
+    <file>resources/path with spaces.txt</file>
 </qresource>
 </RCC>