diff --git a/WebCore/platform/KURL.h b/WebCore/platform/KURL.h index dbe29b6..dcf9693 100644 --- a/WebCore/platform/KURL.h +++ b/WebCore/platform/KURL.h @@ -69,7 +69,7 @@ public: KURL(CFURLRef); #endif #if PLATFORM(QT) - KURL(const QUrl&); + explicit KURL(const QUrl&); #endif bool isEmpty() const { return urlString.isEmpty(); } bool hasPath() const; diff --git a/WebCore/platform/network/qt/QNetworkReplyHandler.cpp b/WebCore/platform/network/qt/QNetworkReplyHandler.cpp index e33077e..9815a2c 100644 --- a/WebCore/platform/network/qt/QNetworkReplyHandler.cpp +++ b/WebCore/platform/network/qt/QNetworkReplyHandler.cpp @@ -144,7 +144,7 @@ void QNetworkReplyHandler::sendResponseIfNeeded() if (redirection.isValid()) { QUrl newUrl = m_reply->url().resolved(redirection); ResourceRequest newRequest = m_resourceHandle->request(); - newRequest.setURL(newUrl); + newRequest.setURL(KURL(newUrl)); client->willSendRequest(m_resourceHandle, newRequest, response); if (statusCode >= 301 && statusCode <= 303 && m_method == QNetworkAccessManager::PostOperation) diff --git a/WebKit/qt/Api/qwebframe.cpp b/WebKit/qt/Api/qwebframe.cpp index a7140d4..e022c97 100644 --- a/WebKit/qt/Api/qwebframe.cpp +++ b/WebKit/qt/Api/qwebframe.cpp @@ -330,7 +330,7 @@ void QWebFrame::load(const QNetworkRequest &req, QUrl url = req.url(); - WebCore::ResourceRequest request(url); + WebCore::ResourceRequest request = KURL(url); switch (operation) { case QNetworkAccessManager::HeadOperation: diff --git a/WebKit/qt/Api/qwebpage.cpp b/WebKit/qt/Api/qwebpage.cpp index 2c285e9..3302c43 100644 --- a/WebKit/qt/Api/qwebpage.cpp +++ b/WebKit/qt/Api/qwebpage.cpp @@ -805,7 +805,7 @@ QObject *QWebPage::createPlugin(const QString &classid, const QUrl &url, const Q static WebCore::FrameLoadRequest frameLoadRequest(const QUrl &url, WebCore::Frame *frame) { - WebCore::ResourceRequest rr(url, frame->loader()->outgoingReferrer()); + WebCore::ResourceRequest rr(KURL(url), frame->loader()->outgoingReferrer()); return WebCore::FrameLoadRequest(rr); } @@ -849,7 +849,7 @@ void QWebPage::triggerAction(WebAction action, bool checked) break; case DownloadLinkToDisk: case CopyLinkToClipboard: - editor->copyURL(d->currentContext.linkUrl(), d->currentContext.text()); + editor->copyURL(KURL(d->currentContext.linkUrl()), d->currentContext.text()); break; case OpenImageInNewWindow: openNewWindow(d->currentContext.imageUrl(), frame);