diff options
author | Michael BrĂ¼ning <michael.bruning@digia.com> | 2014-04-14 16:07:51 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-14 18:17:22 +0200 |
commit | 1a66aba6aae45292c7fdd88c985ce1122e8e58dc (patch) | |
tree | ef3bb11c9e5530550f59ab057d7bee736c29c5a4 /src/webenginewidgets/api/qwebenginepage.h | |
parent | aff45885400cd068fbf438a941736841e41607b4 (diff) |
Map Javascript console message level to enum values.
Translates the internally used LogSeverity values to
enums defined by the QtWebEngine integration layer.
Change-Id: I7da0983d4fb5c199e1a2436b5899a43cf6698784
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'src/webenginewidgets/api/qwebenginepage.h')
-rw-r--r-- | src/webenginewidgets/api/qwebenginepage.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h index 04db99750..fcec92f85 100644 --- a/src/webenginewidgets/api/qwebenginepage.h +++ b/src/webenginewidgets/api/qwebenginepage.h @@ -287,6 +287,13 @@ public: FileSelectOpenMultiple, }; + // must match WebContentsAdapterClient::JavaScriptConsoleMessageLevel + enum JavaScriptConsoleMessageLevel { + Info = 0, + Warning, + Error + }; + class QWEBENGINEWIDGETS_EXPORT ViewportAttributes { public: ViewportAttributes(); @@ -569,7 +576,7 @@ protected: virtual void javaScriptAlert(QWebEngineFrame *originatingFrame, const QString& msg); virtual bool javaScriptConfirm(QWebEngineFrame *originatingFrame, const QString& msg); virtual bool javaScriptPrompt(QWebEngineFrame *originatingFrame, const QString& msg, const QString& defaultValue, QString* result); - virtual void javaScriptConsoleMessage(int level, const QString& message, int lineNumber, const QString& sourceID); + virtual void javaScriptConsoleMessage(JavaScriptConsoleMessageLevel level, const QString& message, int lineNumber, const QString& sourceID); virtual QString userAgentForUrl(const QUrl& url) const { Q_UNUSED(url); Q_UNREACHABLE(); return QString(); } |