diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-02-01 14:51:46 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-02-01 14:51:46 +0100 |
| commit | d782265b08e28ccb6cb83e32b449386b7883848c (patch) | |
| tree | ab7ac80d26434366c0fd4cc4fb5302cc8e2c6cf6 /src/webenginewidgets/api | |
| parent | 3bff0bae7e0c660fc25c5c46dedaf9cb89563a58 (diff) | |
| parent | 435586eedf983ab9b81291cb8cdfcce28822a0c4 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I2889e49fe9f71bfc996689feb0f350e09569f611
Diffstat (limited to 'src/webenginewidgets/api')
| -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 4fd195074..5eda8c72f 100644 --- a/src/webenginewidgets/api/qwebenginepage.h +++ b/src/webenginewidgets/api/qwebenginepage.h @@ -77,8 +77,6 @@ class QWEBENGINEWIDGETS_EXPORT QWebEnginePage : public QObject { Q_OBJECT Q_PROPERTY(QString selectedText READ selectedText) Q_PROPERTY(bool hasSelection READ hasSelection) - - // Ex-QWebFrame properties Q_PROPERTY(QUrl requestedUrl READ requestedUrl) Q_PROPERTY(qreal zoomFactor READ zoomFactor WRITE setZoomFactor) Q_PROPERTY(QString title READ title) |