diff options
| author | Michael Brüning <michael.bruning@digia.com> | 2014-05-12 11:55:58 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-12 15:13:25 +0200 |
| commit | 85af7572d7326b0580970e8871b3f540b04fd484 (patch) | |
| tree | 072c5ca74715972f0c978e299b2bf5802d87b7ef | |
| parent | 17ffa82410b7470fc26fce0e2be2e107635fc0c6 (diff) | |
| download | qtwebengine-85af7572d7326b0580970e8871b3f540b04fd484.tar.gz | |
Append MessageLevel postfix to the JavaScriptConsoleMessageLevel.
This keeps consistency with the other enum names.
Change-Id: Idaedb8566fd770b05effeeba377b09a84bf0af12
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| -rw-r--r-- | src/webengine/api/qquickwebengineview_p.h | 6 | ||||
| -rw-r--r-- | src/webenginewidgets/api/qwebenginepage.h | 6 | ||||
| -rw-r--r-- | tests/auto/quick/publicapi/tst_publicapi.cpp | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h index 2956c61a5..78499081c 100644 --- a/src/webengine/api/qquickwebengineview_p.h +++ b/src/webengine/api/qquickwebengineview_p.h @@ -103,9 +103,9 @@ public: // must match WebContentsAdapterClient::JavaScriptConsoleMessageLevel enum JavaScriptConsoleMessageLevel { - Info = 0, - Warning, - Error + InfoMessageLevel = 0, + WarningMessageLevel, + ErrorMessageLevel }; public Q_SLOTS: diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h index 9ef6e6840..4c24db61e 100644 --- a/src/webenginewidgets/api/qwebenginepage.h +++ b/src/webenginewidgets/api/qwebenginepage.h @@ -133,9 +133,9 @@ public: // must match WebContentsAdapterClient::JavaScriptConsoleMessageLevel enum JavaScriptConsoleMessageLevel { - Info = 0, - Warning, - Error + InfoMessageLevel = 0, + WarningMessageLevel, + ErrorMessageLevel }; explicit QWebEnginePage(QObject *parent = 0); diff --git a/tests/auto/quick/publicapi/tst_publicapi.cpp b/tests/auto/quick/publicapi/tst_publicapi.cpp index 3edc85ce8..57b6e9001 100644 --- a/tests/auto/quick/publicapi/tst_publicapi.cpp +++ b/tests/auto/quick/publicapi/tst_publicapi.cpp @@ -87,9 +87,9 @@ static QStringList expectedAPI = QStringList() << "QQuickWebEngineView.NewViewInWindow --> NewViewDestination" << "QQuickWebEngineView.NewViewInTab --> NewViewDestination" << "QQuickWebEngineView.NewViewInDialog --> NewViewDestination" - << "QQuickWebEngineView.Info --> JavaScriptConsoleMessageLevel" - << "QQuickWebEngineView.Warning --> JavaScriptConsoleMessageLevel" - << "QQuickWebEngineView.Error --> JavaScriptConsoleMessageLevel" + << "QQuickWebEngineView.InfoMessageLevel --> JavaScriptConsoleMessageLevel" + << "QQuickWebEngineView.WarningMessageLevel --> JavaScriptConsoleMessageLevel" + << "QQuickWebEngineView.ErrorMessageLevel --> JavaScriptConsoleMessageLevel" << "QQuickWebEngineView.title --> QString" << "QQuickWebEngineView.url --> QUrl" << "QQuickWebEngineView.icon --> QUrl" |