summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichael BrĂ¼ning <michael.bruning@digia.com>2014-05-12 11:55:58 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-05-12 15:13:25 +0200
commit85af7572d7326b0580970e8871b3f540b04fd484 (patch)
tree072c5ca74715972f0c978e299b2bf5802d87b7ef /src
parent17ffa82410b7470fc26fce0e2be2e107635fc0c6 (diff)
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>
Diffstat (limited to 'src')
-rw-r--r--src/webengine/api/qquickwebengineview_p.h6
-rw-r--r--src/webenginewidgets/api/qwebenginepage.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h
index 2956c61a..78499081 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 9ef6e684..4c24db61 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);