diff options
author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-01-24 18:04:55 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-12 17:13:31 +0100 |
commit | bf65a7dcad419ed8d7e504a3ceece56cd7afa1e4 (patch) | |
tree | 3e0025c6a61148456676a51f30588e4c9d170645 /src/webenginewidgets/api/qwebenginepage.h | |
parent | e599e1f018f23fcd3089a87fdbf09496724122ce (diff) |
Fix tst_QWebEngineFrame::baseUrl
Update tests to check that we can keep the same functionality by
querying document.baseURI through runJavaScript instead of implementing
QWebEnginePage::baseUrl.
This also removes QWebEnginePage::baseUrl from the header.
Change-Id: I549e57d3986e22986438f8a23e469bbd220633b7
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Diffstat (limited to 'src/webenginewidgets/api/qwebenginepage.h')
-rw-r--r-- | src/webenginewidgets/api/qwebenginepage.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h index f8b40f507..13be38238 100644 --- a/src/webenginewidgets/api/qwebenginepage.h +++ b/src/webenginewidgets/api/qwebenginepage.h @@ -133,7 +133,6 @@ class QWEBENGINEWIDGETS_EXPORT QWebEnginePage : public QObject { // Ex-QWebFrame properties Q_PROPERTY(qreal textSizeMultiplier READ textSizeMultiplier WRITE setTextSizeMultiplier DESIGNABLE false) Q_PROPERTY(QUrl requestedUrl READ requestedUrl) - Q_PROPERTY(QUrl baseUrl READ baseUrl) Q_PROPERTY(QIcon icon READ icon) Q_PROPERTY(QSize contentsSize READ contentsSize) Q_PROPERTY(QPoint scrollPosition READ scrollPosition WRITE setScrollPosition) @@ -442,7 +441,6 @@ public: void setUrl(const QUrl &url); QUrl url() const; QUrl requestedUrl() const; - QUrl baseUrl() const; QIcon icon() const; QMultiMap<QString, QString> metaData() const; |