diff options
| author | Valentin Fokin <fokinv@inf.u-szeged.hu> | 2018-03-20 17:22:55 +0100 |
|---|---|---|
| committer | Valentin Fokin <fokinv@inf.u-szeged.hu> | 2018-03-22 09:45:54 +0000 |
| commit | 8e94ad5d15c36f205e3828a612eaa2ce7922beef (patch) | |
| tree | 99e417ade1c2c84b1c6e5d68d7f12066db8ddc71 /src/webengine/api | |
| parent | 438d0aeb1a2a0d4ecde86cb75b8db39cf75771f2 (diff) | |
Remove MediaNone, CanDoNone flags from QWebEngineContextMenuData
Task-number: QTBUG-66994
Change-Id: I8e5ce23e2326fff078e11cadc70274641eeef132
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src/webengine/api')
| -rw-r--r-- | src/webengine/api/qquickwebenginecontextmenurequest.cpp | 8 | ||||
| -rw-r--r-- | src/webengine/api/qquickwebenginecontextmenurequest_p.h | 2 |
2 files changed, 0 insertions, 10 deletions
diff --git a/src/webengine/api/qquickwebenginecontextmenurequest.cpp b/src/webengine/api/qquickwebenginecontextmenurequest.cpp index dea89b9ab..e1ebd4c8c 100644 --- a/src/webengine/api/qquickwebenginecontextmenurequest.cpp +++ b/src/webengine/api/qquickwebenginecontextmenurequest.cpp @@ -59,8 +59,6 @@ ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::MediaTypePlugin, QQuickWebEngineContextMenuRequest::MediaTypePlugin) // Match MediaFlag enum -ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::MediaNone, - QQuickWebEngineContextMenuRequest::MediaNone) ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::MediaInError, QQuickWebEngineContextMenuRequest::MediaInError) ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::MediaPaused, @@ -83,8 +81,6 @@ ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::MediaCanRotate, QQuickWebEngineContextMenuRequest::MediaCanRotate) // Match EditFlag enum -ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::CanDoNone, - QQuickWebEngineContextMenuRequest::CanDoNone) ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::CanUndo, QQuickWebEngineContextMenuRequest::CanUndo) ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::CanRedo, @@ -327,8 +323,6 @@ void QQuickWebEngineContextMenuRequest::setAccepted(bool accepted) The current media element's status and its available operations. \c MediaNone if the selected web page content is not a media element. - \value ContextMenuRequest.MediaNone - Not a media element. \value ContextMenuRequest.MediaInError An error occurred. \value ContextMenuRequest.MediaPaused @@ -362,8 +356,6 @@ QQuickWebEngineContextMenuRequest::MediaFlags QQuickWebEngineContextMenuRequest: The available edit operations in the current context or \c CanDoNone if no actions are available. - \value ContextMenuRequest.CanDoNone - Nothing can be done. \value ContextMenuRequest.CanUndo Undo is available. \value ContextMenuRequest.CanRedo diff --git a/src/webengine/api/qquickwebenginecontextmenurequest_p.h b/src/webengine/api/qquickwebenginecontextmenurequest_p.h index 5f0b0c282..d8da35c66 100644 --- a/src/webengine/api/qquickwebenginecontextmenurequest_p.h +++ b/src/webengine/api/qquickwebenginecontextmenurequest_p.h @@ -77,7 +77,6 @@ public: // Must match QWebEngineCore::WebEngineContextMenuData::MediaFlags: enum MediaFlag { - MediaNone = 0x0, MediaInError = 0x1, MediaPaused = 0x2, MediaMuted = 0x4, @@ -94,7 +93,6 @@ public: // Must match QWebEngineCore::WebEngineContextMenuData::EditFlags: enum EditFlag { - CanDoNone = 0x0, CanUndo = 0x1, CanRedo = 0x2, CanCut = 0x4, |