14 files changed, 3 insertions, 57 deletions
diff --git a/src/jar/src/org/qtproject/qt/android/view/QtAndroidWebViewController.java b/src/jar/src/org/qtproject/qt/android/view/QtAndroidWebViewController.java
index ff0d411..d15cbb4 100644
--- a/src/jar/src/org/qtproject/qt/android/view/QtAndroidWebViewController.java
+++ b/src/jar/src/org/qtproject/qt/android/view/QtAndroidWebViewController.java
@@ -560,24 +560,6 @@ class QtAndroidWebViewController
         });
     }
 
-    String getUrl()
-    {
-        final String[] url = {""};
-        final Semaphore sem = new Semaphore(0);
-        m_activity.runOnUiThread(new Runnable() {
-            @Override
-            public void run() { url[0] = m_webView.getUrl(); sem.release(); }
-        });
-
-        try {
-            sem.tryAcquire(BLOCKING_TIMEOUT, TimeUnit.MILLISECONDS);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        return url[0];
-    }
-
     WebView getWebView()
     {
        return m_webView;
diff --git a/src/plugins/android/qandroidwebview.cpp b/src/plugins/android/qandroidwebview.cpp
index 47b0e61..50f2d36 100644
--- a/src/plugins/android/qandroidwebview.cpp
+++ b/src/plugins/android/qandroidwebview.cpp
@@ -124,11 +124,6 @@ void QAndroidWebViewPrivate::setHttpUserAgent(const QString &userAgent)
     Q_EMIT httpUserAgentChanged(userAgent);
 }
 
-QUrl QAndroidWebViewPrivate::url() const
-{
-    return QUrl::fromUserInput(m_viewController.callMethod<QString>("getUrl"));
-}
-
 void QAndroidWebViewPrivate::setUrl(const QUrl &url)
 {
     m_viewController.callMethod<void>("loadUrl", url.toString());
diff --git a/src/plugins/android/qandroidwebview_p.h b/src/plugins/android/qandroidwebview_p.h
index 1f1ae60..1e1da1f 100644
--- a/src/plugins/android/qandroidwebview_p.h
+++ b/src/plugins/android/qandroidwebview_p.h
@@ -60,7 +60,6 @@ public:
 
     QString httpUserAgent() const override;
     void setHttpUserAgent(const QString &httpUserAgent) override;
-    QUrl url() const override;
     void setUrl(const QUrl &url) override;
     bool canGoBack() const override;
     bool canGoForward() const override;
diff --git a/src/plugins/darwin/qdarwinwebview_p.h b/src/plugins/darwin/qdarwinwebview_p.h
index 010b2a7..9d35787 100644
--- a/src/plugins/darwin/qdarwinwebview_p.h
+++ b/src/plugins/darwin/qdarwinwebview_p.h
@@ -77,7 +77,7 @@ public:
 
     QString httpUserAgent() const override;
     void setHttpUserAgent(const QString &httpUserAgent) override;
-    QUrl url() const override;
+    QUrl url() const;
     void setUrl(const QUrl &url) override;
     bool canGoBack() const override;
     bool canGoForward() const override;
diff --git a/src/plugins/wasm/qwasmwebview.cpp b/src/plugins/wasm/qwasmwebview.cpp
index 6325aca..ff6235e 100644
--- a/src/plugins/wasm/qwasmwebview.cpp
+++ b/src/plugins/wasm/qwasmwebview.cpp
@@ -92,14 +92,6 @@ void QWasmWebViewPrivate::setHttpUserAgent(const QString &userAgent)
     qWarning("setHttpUserAgent() not supported on this platform");
 }
 
-QUrl QWasmWebViewPrivate::url() const
-{
-    if (m_iframe)
-        return QUrl(QString::fromStdString(
-                (*m_iframe)["contentWindow"]["location"]["href"].as<std::string>()));
-    return QUrl::fromUserInput("");
-}
-
 void QWasmWebViewPrivate::setUrl(const QUrl &url)
 {
     m_currentUrl = url;
diff --git a/src/plugins/wasm/qwasmwebview_p.h b/src/plugins/wasm/qwasmwebview_p.h
index d71b73c..521f88e 100644
--- a/src/plugins/wasm/qwasmwebview_p.h
+++ b/src/plugins/wasm/qwasmwebview_p.h
@@ -55,7 +55,6 @@ public:
 
     QString httpUserAgent() const final;
     void setHttpUserAgent(const QString &httpUserAgent) final;
-    QUrl url() const final;
     void setUrl(const QUrl &url) final;
     bool canGoBack() const final;
     bool canGoForward() const final;
diff --git a/src/plugins/webengine/qwebenginewebview.cpp b/src/plugins/webengine/qwebenginewebview.cpp
index 958761d..0f747ee 100644
--- a/src/plugins/webengine/qwebenginewebview.cpp
+++ b/src/plugins/webengine/qwebenginewebview.cpp
@@ -59,11 +59,6 @@ void QWebEngineWebViewPrivate::setHttpUserAgent(const QString &userAgent)
     }
 }
 
-QUrl QWebEngineWebViewPrivate::url() const
-{
-    return m_webEngineView->url();
-}
-
 void QWebEngineWebViewPrivate::setUrl(const QUrl &url)
 {
     m_webEngineView->setUrl(url);
diff --git a/src/plugins/webengine/qwebenginewebview_p.h b/src/plugins/webengine/qwebenginewebview_p.h
index 929f290..a743eab 100644
--- a/src/plugins/webengine/qwebenginewebview_p.h
+++ b/src/plugins/webengine/qwebenginewebview_p.h
@@ -70,7 +70,6 @@ public:
 
     QString httpUserAgent() const override;
     void setHttpUserAgent(const QString &userAgent) override;
-    QUrl url() const override;
     void setUrl(const QUrl &url) override;
     bool canGoBack() const override;
     bool canGoForward() const override;
diff --git a/src/plugins/winrt/qwinrtwebview.cpp b/src/plugins/winrt/qwinrtwebview.cpp
index a46fada..74b5b83 100644
--- a/src/plugins/winrt/qwinrtwebview.cpp
+++ b/src/plugins/winrt/qwinrtwebview.cpp
@@ -372,18 +372,6 @@ void QWinRTWebViewPrivate::setHttpUserAgent(const QString &userAgent)
 #endif
 }
 
-QUrl QWinRTWebViewPrivate::url() const
-{
-    ComPtr<IUriRuntimeClass> uri;
-    QEventDispatcherWinRT::runOnXamlThread([this, &uri]() {
-        HRESULT hr;
-        hr = d->base->get_Source(&uri);
-        Q_ASSERT_SUCCEEDED(hr);
-        return hr;
-    });
-    return qurlFromUri(uri.Get());
-}
-
 void QWinRTWebViewPrivate::setUrl(const QUrl &url)
 {
     QEventDispatcherWinRT::runOnXamlThread([this, &url]() {
diff --git a/src/plugins/winrt/qwinrtwebview_p.h b/src/plugins/winrt/qwinrtwebview_p.h
index 9b7be1d..ddf35db 100644
--- a/src/plugins/winrt/qwinrtwebview_p.h
+++ b/src/plugins/winrt/qwinrtwebview_p.h
@@ -44,7 +44,6 @@ public:
 
     QString httpUserAgent() const override;
     void setHttpUserAgent(const QString &userAgent) override;
-    QUrl url() const override;
     void setUrl(const QUrl &url) override;
     bool canGoBack() const override;
     bool canGoForward() const override;
diff --git a/src/quick/qquickwebview_p.h b/src/quick/qquickwebview_p.h
index a6f7b6e..ac8525a 100644
--- a/src/quick/qquickwebview_p.h
+++ b/src/quick/qquickwebview_p.h
@@ -59,7 +59,7 @@ public:
 
     QString httpUserAgent() const override;
     void setHttpUserAgent(const QString &userAgent) override;
-    QUrl url() const override;
+    QUrl url() const;
     void setUrl(const QUrl &url) override;
     int loadProgress() const override;
     QString title() const override;
diff --git a/src/webview/qwebview_p.h b/src/webview/qwebview_p.h
index 42eb1ff..33547dd 100644
--- a/src/webview/qwebview_p.h
+++ b/src/webview/qwebview_p.h
@@ -81,7 +81,7 @@ public:
 
     QString httpUserAgent() const override;
     void setHttpUserAgent(const QString &httpUserAgent) override;
-    QUrl url() const override;
+    QUrl url() const;
     void setUrl(const QUrl &url) override;
     bool canGoBack() const override;
     bool canGoForward() const override;
diff --git a/src/webview/qwebviewfactory.cpp b/src/webview/qwebviewfactory.cpp
index 12f054c..657529f 100644
--- a/src/webview/qwebviewfactory.cpp
+++ b/src/webview/qwebviewfactory.cpp
@@ -51,7 +51,6 @@ public:
 
     QString httpUserAgent() const override { return QString(); }
     void setHttpUserAgent(const QString &userAgent) override { Q_UNUSED(userAgent); }
-    QUrl url() const override { return QUrl(); }
     void setUrl(const QUrl &url) override { Q_UNUSED(url); }
     bool canGoBack() const override { return false; }
     bool canGoForward() const override { return false; }
diff --git a/src/webview/qwebviewinterface_p.h b/src/webview/qwebviewinterface_p.h
index 70a8bfe..669d322 100644
--- a/src/webview/qwebviewinterface_p.h
+++ b/src/webview/qwebviewinterface_p.h
@@ -33,7 +33,6 @@ public:
     virtual ~QWebViewInterface() {}
     virtual QString httpUserAgent() const = 0;
     virtual void setHttpUserAgent(const QString &httpUserAgent) = 0;
-    virtual QUrl url() const = 0;
     virtual void setUrl(const QUrl &url) = 0;
     virtual bool canGoBack() const = 0;
     virtual bool canGoForward() const = 0;