diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-02-03 16:43:32 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-12 17:13:43 +0100 |
| commit | 0a2e36792a6728b2e19efd7f228d70adff0d78e1 (patch) | |
| tree | a6180efde196c2cf97bbf5d4c81ef204a886b34d /src | |
| parent | 0f08a0fc028eb647c435ffe95d5d673ed75b058b (diff) | |
Fix tst_QWebEngineFrame::setUrlWithFragment
The query string and the fragment are part of the path.
Make sure that they aren't used for the file lookup.
Change-Id: I7adfe913a56b1292e7444de18b2dbe332bd4657a
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/url_request_qrc_job_qt.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/url_request_qrc_job_qt.cpp b/src/core/url_request_qrc_job_qt.cpp index ccdb4f9b6..c84d59eb8 100644 --- a/src/core/url_request_qrc_job_qt.cpp +++ b/src/core/url_request_qrc_job_qt.cpp @@ -41,6 +41,8 @@ #include "url_request_qrc_job_qt.h" +#include "type_conversion.h" + #include "net/base/net_errors.h" #include "net/base/io_buffer.h" @@ -114,7 +116,7 @@ bool URLRequestQrcJobQt::ReadRawData(IOBuffer *buf, int bufSize, int *bytesRead) void URLRequestQrcJobQt::startGetHead() { // Get qrc file path. - QString qrcFilePath = ':' + QString::fromStdString(request_->url().path()); + QString qrcFilePath = ':' + toQt(request_->url()).path(QUrl::RemovePath | QUrl::RemoveQuery); m_file.setFileName(qrcFilePath); QFileInfo qrcFileInfo(m_file); // Get qrc file mime type. |