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/core/web_contents_adapter.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/core/web_contents_adapter.h')
| -rw-r--r-- | src/core/web_contents_adapter.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/web_contents_adapter.h b/src/core/web_contents_adapter.h index de537541d..2079c89b1 100644 --- a/src/core/web_contents_adapter.h +++ b/src/core/web_contents_adapter.h @@ -67,7 +67,7 @@ public: void stop(); void reload(); void load(const QUrl&); - void setContent(const QByteArray &data, const QString &mimeType, const QUrl &baseUrl, const QUrl &unreachableUrl = QUrl()); + void setContent(const QByteArray &data, const QString &mimeType, const QUrl &baseUrl, const QUrl &unreachableUrl); QUrl activeUrl() const; QString pageTitle() const; |