From 140d12802c9ebc54f5816fbf1a410c5bdc730ec6 Mon Sep 17 00:00:00 2001
From: Aleix Pol <aleixpol@kde.org>
Date: Tue, 14 Mar 2017 12:44:39 +0100
Subject: [PATCH] Include Q_ENUM on QObject interface classes
Adds useful metadata
[ChangeLog][General] Use Q_ENUM on QtWebEngineWidgets interfaces
Change-Id: Iac30298666b560f1ec62adde980d4eff25b49736
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
src/webenginewidgets/api/qwebenginepage.h | 8 ++++++++
src/webenginewidgets/api/qwebengineprofile.h | 2 ++
2 files changed, 10 insertions(+)
diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h
index 6140cf445..c7d5a19e3 100644
--- a/src/webenginewidgets/api/qwebenginepage.h
+++ b/src/webenginewidgets/api/qwebenginepage.h
@@ -134,6 +134,7 @@ public:
ViewSource,
WebActionCount
};
+ Q_ENUM(WebAction)
enum FindFlag {
FindBackward = 1,
@@ -147,12 +148,14 @@ public:
WebDialog,
WebBrowserBackgroundTab
};
+ Q_ENUM(WebWindowType)
enum PermissionPolicy {
PermissionUnknown,
PermissionGrantedByUser,
PermissionDeniedByUser
};
+ Q_ENUM(PermissionPolicy)
// must match WebContentsAdapterClient::NavigationType
enum NavigationType {
@@ -163,6 +166,7 @@ public:
NavigationTypeReload,
NavigationTypeOther
};
+ Q_ENUM(NavigationType)
enum Feature {
#ifndef Q_QDOC
@@ -174,6 +178,7 @@ public:
MediaAudioVideoCapture,
MouseLock
};
+ Q_ENUM(Feature)
// Ex-QWebFrame enum
@@ -181,6 +186,7 @@ public:
FileSelectOpen,
FileSelectOpenMultiple,
};
+ Q_ENUM(FileSelectionMode)
// must match WebContentsAdapterClient::JavaScriptConsoleMessageLevel
enum JavaScriptConsoleMessageLevel {
@@ -188,6 +194,7 @@ public:
WarningMessageLevel,
ErrorMessageLevel
};
+ Q_ENUM(JavaScriptConsoleMessageLevel)
// must match WebContentsAdapterClient::RenderProcessTerminationStatus
enum RenderProcessTerminationStatus {
@@ -196,6 +203,7 @@ public:
CrashedTerminationStatus,
KilledTerminationStatus
};
+ Q_ENUM(RenderProcessTerminationStatus)
explicit QWebEnginePage(QObject *parent = Q_NULLPTR);
QWebEnginePage(QWebEngineProfile *profile, QObject *parent = Q_NULLPTR);
diff --git a/src/webenginewidgets/api/qwebengineprofile.h b/src/webenginewidgets/api/qwebengineprofile.h
index 1ce4bfe17..f9a564cd2 100644
--- a/src/webenginewidgets/api/qwebengineprofile.h
+++ b/src/webenginewidgets/api/qwebengineprofile.h
@@ -72,12 +72,14 @@ public:
DiskHttpCache,
NoCache
};
+ Q_ENUM(HttpCacheType)
enum PersistentCookiesPolicy {
NoPersistentCookies,
AllowPersistentCookies,
ForcePersistentCookies
};
+ Q_ENUM(PersistentCookiesPolicy)
QString storageName() const;
bool isOffTheRecord() const;
--
GitLab