summaryrefslogtreecommitdiffstats
path: root/src/webenginequick
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2021-05-10 12:24:08 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2021-05-26 10:49:05 +0200
commit3ecfda614a7ee9037bdc51f120de4da8f017c016 (patch)
tree39ace60382347d36229cdc8a72084969891f9fd8 /src/webenginequick
parentd53f7fcc52ab8f10ff406d5ae3bd00deeab969d8 (diff)
Add major revision to revisioned symbols
Should make imports of 2.0 include all of 1.x. Change-Id: Ibaf40d7e363524820dbd06356998ec780752717f Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src/webenginequick')
-rw-r--r--src/webenginequick/api/qquickwebenginehistory_p.h2
-rw-r--r--src/webenginequick/api/qquickwebenginenewviewrequest_p.h2
-rw-r--r--src/webenginequick/api/qquickwebengineprofile.h24
-rw-r--r--src/webenginequick/api/qquickwebenginesettings_p.h72
-rw-r--r--src/webenginequick/api/qquickwebenginesingleton_p.h2
-rw-r--r--src/webenginequick/api/qquickwebengineview_p.h142
6 files changed, 121 insertions, 123 deletions
diff --git a/src/webenginequick/api/qquickwebenginehistory_p.h b/src/webenginequick/api/qquickwebenginehistory_p.h
index 828109230..8433e8dd5 100644
--- a/src/webenginequick/api/qquickwebenginehistory_p.h
+++ b/src/webenginequick/api/qquickwebenginehistory_p.h
@@ -106,7 +106,7 @@ public:
QQuickWebEngineHistoryListModel *items() const;
QQuickWebEngineHistoryListModel *backItems() const;
QQuickWebEngineHistoryListModel *forwardItems() const;
- Q_REVISION(1) Q_INVOKABLE void clear();
+ Q_REVISION(1,1) Q_INVOKABLE void clear();
void reset();
diff --git a/src/webenginequick/api/qquickwebenginenewviewrequest_p.h b/src/webenginequick/api/qquickwebenginenewviewrequest_p.h
index e1e0e5abd..57ec76f79 100644
--- a/src/webenginequick/api/qquickwebenginenewviewrequest_p.h
+++ b/src/webenginequick/api/qquickwebenginenewviewrequest_p.h
@@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE
class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineNewViewRequest : public QObject {
Q_OBJECT
Q_PROPERTY(QQuickWebEngineView::NewViewDestination destination READ destination CONSTANT FINAL)
- Q_PROPERTY(QUrl requestedUrl READ requestedUrl CONSTANT REVISION 1 FINAL)
+ Q_PROPERTY(QUrl requestedUrl READ requestedUrl CONSTANT REVISION(1,1) FINAL)
Q_PROPERTY(bool userInitiated READ isUserInitiated CONSTANT FINAL)
public:
~QQuickWebEngineNewViewRequest();
diff --git a/src/webenginequick/api/qquickwebengineprofile.h b/src/webenginequick/api/qquickwebengineprofile.h
index c3f2f7958..61fd3ee18 100644
--- a/src/webenginequick/api/qquickwebengineprofile.h
+++ b/src/webenginequick/api/qquickwebengineprofile.h
@@ -66,18 +66,18 @@ class Q_WEBENGINE_EXPORT QQuickWebEngineProfile : public QObject {
Q_PROPERTY(QString cachePath READ cachePath WRITE setCachePath NOTIFY cachePathChanged FINAL)
Q_PROPERTY(QString httpUserAgent READ httpUserAgent WRITE setHttpUserAgent NOTIFY httpUserAgentChanged FINAL)
Q_PROPERTY(HttpCacheType httpCacheType READ httpCacheType WRITE setHttpCacheType NOTIFY httpCacheTypeChanged FINAL)
- Q_PROPERTY(QString httpAcceptLanguage READ httpAcceptLanguage WRITE setHttpAcceptLanguage NOTIFY httpAcceptLanguageChanged FINAL REVISION 1)
+ Q_PROPERTY(QString httpAcceptLanguage READ httpAcceptLanguage WRITE setHttpAcceptLanguage NOTIFY httpAcceptLanguageChanged FINAL REVISION(1,1))
Q_PROPERTY(PersistentCookiesPolicy persistentCookiesPolicy READ persistentCookiesPolicy WRITE setPersistentCookiesPolicy NOTIFY persistentCookiesPolicyChanged FINAL)
Q_PROPERTY(int httpCacheMaximumSize READ httpCacheMaximumSize WRITE setHttpCacheMaximumSize NOTIFY httpCacheMaximumSizeChanged FINAL)
- Q_PROPERTY(QStringList spellCheckLanguages READ spellCheckLanguages WRITE setSpellCheckLanguages NOTIFY spellCheckLanguagesChanged FINAL REVISION 3)
- Q_PROPERTY(bool spellCheckEnabled READ isSpellCheckEnabled WRITE setSpellCheckEnabled NOTIFY spellCheckEnabledChanged FINAL REVISION 3)
+ Q_PROPERTY(QStringList spellCheckLanguages READ spellCheckLanguages WRITE setSpellCheckLanguages NOTIFY spellCheckLanguagesChanged FINAL REVISION(1,3))
+ Q_PROPERTY(bool spellCheckEnabled READ isSpellCheckEnabled WRITE setSpellCheckEnabled NOTIFY spellCheckEnabledChanged FINAL REVISION(1,3))
Q_PROPERTY(QQuickWebEngineScriptCollection *userScripts READ userScripts)
Q_PROPERTY(bool useForGlobalCertificateVerification
READ isUsedForGlobalCertificateVerification
WRITE setUseForGlobalCertificateVerification
NOTIFY useForGlobalCertificateVerificationChanged
- FINAL REVISION 5)
- Q_PROPERTY(QString downloadPath READ downloadPath WRITE setDownloadPath NOTIFY downloadPathChanged FINAL REVISION 5)
+ FINAL REVISION(1,5))
+ Q_PROPERTY(QString downloadPath READ downloadPath WRITE setDownloadPath NOTIFY downloadPathChanged FINAL REVISION(1,5))
public:
QQuickWebEngineProfile(QObject *parent = Q_NULLPTR);
@@ -134,7 +134,7 @@ public:
void removeUrlSchemeHandler(QWebEngineUrlSchemeHandler *);
void removeAllUrlSchemeHandlers();
- Q_REVISION(2) Q_INVOKABLE void clearHttpCache();
+ Q_REVISION(1,2) Q_INVOKABLE void clearHttpCache();
void setSpellCheckLanguages(const QStringList &languages);
QStringList spellCheckLanguages() const;
@@ -162,15 +162,15 @@ Q_SIGNALS:
void httpCacheTypeChanged();
void persistentCookiesPolicyChanged();
void httpCacheMaximumSizeChanged();
- Q_REVISION(1) void httpAcceptLanguageChanged();
- Q_REVISION(3) void spellCheckLanguagesChanged();
- Q_REVISION(3) void spellCheckEnabledChanged();
- Q_REVISION(5) void useForGlobalCertificateVerificationChanged();
- Q_REVISION(5) void downloadPathChanged();
+ Q_REVISION(1,1) void httpAcceptLanguageChanged();
+ Q_REVISION(1,3) void spellCheckLanguagesChanged();
+ Q_REVISION(1,3) void spellCheckEnabledChanged();
+ Q_REVISION(1,5) void useForGlobalCertificateVerificationChanged();
+ Q_REVISION(1,5) void downloadPathChanged();
void downloadRequested(QWebEngineDownloadRequest *download);
void downloadFinished(QWebEngineDownloadRequest *download);
- Q_REVISION(5) void presentNotification(QWebEngineNotification *notification);
+ Q_REVISION(1,5) void presentNotification(QWebEngineNotification *notification);
private:
Q_DECLARE_PRIVATE(QQuickWebEngineProfile)
diff --git a/src/webenginequick/api/qquickwebenginesettings_p.h b/src/webenginequick/api/qquickwebenginesettings_p.h
index 8b275235a..f400172e1 100644
--- a/src/webenginequick/api/qquickwebenginesettings_p.h
+++ b/src/webenginequick/api/qquickwebenginesettings_p.h
@@ -76,25 +76,25 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineSettings : public QObject {
Q_PROPERTY(bool hyperlinkAuditingEnabled READ hyperlinkAuditingEnabled WRITE setHyperlinkAuditingEnabled NOTIFY hyperlinkAuditingEnabledChanged FINAL)
Q_PROPERTY(bool errorPageEnabled READ errorPageEnabled WRITE setErrorPageEnabled NOTIFY errorPageEnabledChanged FINAL)
Q_PROPERTY(bool pluginsEnabled READ pluginsEnabled WRITE setPluginsEnabled NOTIFY pluginsEnabledChanged FINAL)
- Q_PROPERTY(bool fullScreenSupportEnabled READ fullScreenSupportEnabled WRITE setFullScreenSupportEnabled NOTIFY fullScreenSupportEnabledChanged REVISION 1 FINAL)
+ Q_PROPERTY(bool fullScreenSupportEnabled READ fullScreenSupportEnabled WRITE setFullScreenSupportEnabled NOTIFY fullScreenSupportEnabledChanged REVISION(1,1) FINAL)
Q_PROPERTY(QString defaultTextEncoding READ defaultTextEncoding WRITE setDefaultTextEncoding NOTIFY defaultTextEncodingChanged FINAL)
- Q_PROPERTY(bool screenCaptureEnabled READ screenCaptureEnabled WRITE setScreenCaptureEnabled NOTIFY screenCaptureEnabledChanged REVISION 2 FINAL)
- Q_PROPERTY(bool webGLEnabled READ webGLEnabled WRITE setWebGLEnabled NOTIFY webGLEnabledChanged REVISION 2 FINAL)
- Q_PROPERTY(bool accelerated2dCanvasEnabled READ accelerated2dCanvasEnabled WRITE setAccelerated2dCanvasEnabled NOTIFY accelerated2dCanvasEnabledChanged REVISION 2 FINAL)
- Q_PROPERTY(bool autoLoadIconsForPage READ autoLoadIconsForPage WRITE setAutoLoadIconsForPage NOTIFY autoLoadIconsForPageChanged REVISION 2 FINAL)
- Q_PROPERTY(bool touchIconsEnabled READ touchIconsEnabled WRITE setTouchIconsEnabled NOTIFY touchIconsEnabledChanged REVISION 2 FINAL)
- Q_PROPERTY(bool focusOnNavigationEnabled READ focusOnNavigationEnabled WRITE setFocusOnNavigationEnabled NOTIFY focusOnNavigationEnabledChanged REVISION 3 FINAL)
- Q_PROPERTY(bool printElementBackgrounds READ printElementBackgrounds WRITE setPrintElementBackgrounds NOTIFY printElementBackgroundsChanged REVISION 3 FINAL)
- Q_PROPERTY(bool allowRunningInsecureContent READ allowRunningInsecureContent WRITE setAllowRunningInsecureContent NOTIFY allowRunningInsecureContentChanged REVISION 3 FINAL)
- Q_PROPERTY(bool allowGeolocationOnInsecureOrigins READ allowGeolocationOnInsecureOrigins WRITE setAllowGeolocationOnInsecureOrigins NOTIFY allowGeolocationOnInsecureOriginsChanged REVISION 4 FINAL)
- Q_PROPERTY(bool allowWindowActivationFromJavaScript READ allowWindowActivationFromJavaScript WRITE setAllowWindowActivationFromJavaScript NOTIFY allowWindowActivationFromJavaScriptChanged REVISION 5 FINAL)
- Q_PROPERTY(bool showScrollBars READ showScrollBars WRITE setShowScrollBars NOTIFY showScrollBarsChanged REVISION 5 FINAL)
- Q_PROPERTY(UnknownUrlSchemePolicy unknownUrlSchemePolicy READ unknownUrlSchemePolicy WRITE setUnknownUrlSchemePolicy NOTIFY unknownUrlSchemePolicyChanged REVISION 6 FINAL)
- Q_PROPERTY(bool playbackRequiresUserGesture READ playbackRequiresUserGesture WRITE setPlaybackRequiresUserGesture NOTIFY playbackRequiresUserGestureChanged REVISION 6 FINAL)
- Q_PROPERTY(bool webRTCPublicInterfacesOnly READ webRTCPublicInterfacesOnly WRITE setWebRTCPublicInterfacesOnly NOTIFY webRTCPublicInterfacesOnlyChanged REVISION 6 FINAL)
- Q_PROPERTY(bool javascriptCanPaste READ javascriptCanPaste WRITE setJavascriptCanPaste NOTIFY javascriptCanPasteChanged REVISION 6 FINAL)
- Q_PROPERTY(bool dnsPrefetchEnabled READ dnsPrefetchEnabled WRITE setDnsPrefetchEnabled NOTIFY dnsPrefetchEnabledChanged REVISION 7 FINAL)
- Q_PROPERTY(bool pdfViewerEnabled READ pdfViewerEnabled WRITE setPdfViewerEnabled NOTIFY pdfViewerEnabledChanged REVISION 8 FINAL)
+ Q_PROPERTY(bool screenCaptureEnabled READ screenCaptureEnabled WRITE setScreenCaptureEnabled NOTIFY screenCaptureEnabledChanged REVISION(1,2) FINAL)
+ Q_PROPERTY(bool webGLEnabled READ webGLEnabled WRITE setWebGLEnabled NOTIFY webGLEnabledChanged REVISION(1,2) FINAL)
+ Q_PROPERTY(bool accelerated2dCanvasEnabled READ accelerated2dCanvasEnabled WRITE setAccelerated2dCanvasEnabled NOTIFY accelerated2dCanvasEnabledChanged REVISION(1,2) FINAL)
+ Q_PROPERTY(bool autoLoadIconsForPage READ autoLoadIconsForPage WRITE setAutoLoadIconsForPage NOTIFY autoLoadIconsForPageChanged REVISION(1,2) FINAL)
+ Q_PROPERTY(bool touchIconsEnabled READ touchIconsEnabled WRITE setTouchIconsEnabled NOTIFY touchIconsEnabledChanged REVISION(1,2) FINAL)
+ Q_PROPERTY(bool focusOnNavigationEnabled READ focusOnNavigationEnabled WRITE setFocusOnNavigationEnabled NOTIFY focusOnNavigationEnabledChanged REVISION(1,3) FINAL)
+ Q_PROPERTY(bool printElementBackgrounds READ printElementBackgrounds WRITE setPrintElementBackgrounds NOTIFY printElementBackgroundsChanged REVISION(1,3) FINAL)
+ Q_PROPERTY(bool allowRunningInsecureContent READ allowRunningInsecureContent WRITE setAllowRunningInsecureContent NOTIFY allowRunningInsecureContentChanged REVISION(1,3) FINAL)
+ Q_PROPERTY(bool allowGeolocationOnInsecureOrigins READ allowGeolocationOnInsecureOrigins WRITE setAllowGeolocationOnInsecureOrigins NOTIFY allowGeolocationOnInsecureOriginsChanged REVISION(1,4) FINAL)
+ Q_PROPERTY(bool allowWindowActivationFromJavaScript READ allowWindowActivationFromJavaScript WRITE setAllowWindowActivationFromJavaScript NOTIFY allowWindowActivationFromJavaScriptChanged REVISION(1,5) FINAL)
+ Q_PROPERTY(bool showScrollBars READ showScrollBars WRITE setShowScrollBars NOTIFY showScrollBarsChanged REVISION(1,5) FINAL)
+ Q_PROPERTY(UnknownUrlSchemePolicy unknownUrlSchemePolicy READ unknownUrlSchemePolicy WRITE setUnknownUrlSchemePolicy NOTIFY unknownUrlSchemePolicyChanged REVISION(1,6) FINAL)
+ Q_PROPERTY(bool playbackRequiresUserGesture READ playbackRequiresUserGesture WRITE setPlaybackRequiresUserGesture NOTIFY playbackRequiresUserGestureChanged REVISION(1,6) FINAL)
+ Q_PROPERTY(bool webRTCPublicInterfacesOnly READ webRTCPublicInterfacesOnly WRITE setWebRTCPublicInterfacesOnly NOTIFY webRTCPublicInterfacesOnlyChanged REVISION(1,6) FINAL)
+ Q_PROPERTY(bool javascriptCanPaste READ javascriptCanPaste WRITE setJavascriptCanPaste NOTIFY javascriptCanPasteChanged REVISION(1,6) FINAL)
+ Q_PROPERTY(bool dnsPrefetchEnabled READ dnsPrefetchEnabled WRITE setDnsPrefetchEnabled NOTIFY dnsPrefetchEnabledChanged REVISION(1,7) FINAL)
+ Q_PROPERTY(bool pdfViewerEnabled READ pdfViewerEnabled WRITE setPdfViewerEnabled NOTIFY pdfViewerEnabledChanged REVISION(1,8) FINAL)
public:
enum UnknownUrlSchemePolicy {
@@ -184,25 +184,25 @@ signals:
void hyperlinkAuditingEnabledChanged();
void errorPageEnabledChanged();
void pluginsEnabledChanged();
- Q_REVISION(1) void fullScreenSupportEnabledChanged();
+ Q_REVISION(1,1) void fullScreenSupportEnabledChanged();
void defaultTextEncodingChanged();
- Q_REVISION(2) void screenCaptureEnabledChanged();
- Q_REVISION(2) void webGLEnabledChanged();
- Q_REVISION(2) void accelerated2dCanvasEnabledChanged();
- Q_REVISION(2) void autoLoadIconsForPageChanged();
- Q_REVISION(2) void touchIconsEnabledChanged();
- Q_REVISION(3) void focusOnNavigationEnabledChanged();
- Q_REVISION(3) void printElementBackgroundsChanged();
- Q_REVISION(3) void allowRunningInsecureContentChanged();
- Q_REVISION(4) void allowGeolocationOnInsecureOriginsChanged();
- Q_REVISION(5) void allowWindowActivationFromJavaScriptChanged();
- Q_REVISION(5) void showScrollBarsChanged();
- Q_REVISION(6) void unknownUrlSchemePolicyChanged();
- Q_REVISION(6) void playbackRequiresUserGestureChanged();
- Q_REVISION(6) void webRTCPublicInterfacesOnlyChanged();
- Q_REVISION(6) void javascriptCanPasteChanged();
- Q_REVISION(7) void dnsPrefetchEnabledChanged();
- Q_REVISION(8) void pdfViewerEnabledChanged();
+ Q_REVISION(1,2) void screenCaptureEnabledChanged();
+ Q_REVISION(1,2) void webGLEnabledChanged();
+ Q_REVISION(1,2) void accelerated2dCanvasEnabledChanged();
+ Q_REVISION(1,2) void autoLoadIconsForPageChanged();
+ Q_REVISION(1,2) void touchIconsEnabledChanged();
+ Q_REVISION(1,3) void focusOnNavigationEnabledChanged();
+ Q_REVISION(1,3) void printElementBackgroundsChanged();
+ Q_REVISION(1,3) void allowRunningInsecureContentChanged();
+ Q_REVISION(1,4) void allowGeolocationOnInsecureOriginsChanged();
+ Q_REVISION(1,5) void allowWindowActivationFromJavaScriptChanged();
+ Q_REVISION(1,5) void showScrollBarsChanged();
+ Q_REVISION(1,6) void unknownUrlSchemePolicyChanged();
+ Q_REVISION(1,6) void playbackRequiresUserGestureChanged();
+ Q_REVISION(1,6) void webRTCPublicInterfacesOnlyChanged();
+ Q_REVISION(1,6) void javascriptCanPasteChanged();
+ Q_REVISION(1,7) void dnsPrefetchEnabledChanged();
+ Q_REVISION(1,8) void pdfViewerEnabledChanged();
private:
explicit QQuickWebEngineSettings(QQuickWebEngineSettings *parentSettings = nullptr);
diff --git a/src/webenginequick/api/qquickwebenginesingleton_p.h b/src/webenginequick/api/qquickwebenginesingleton_p.h
index cd7b5b2da..224bfa495 100644
--- a/src/webenginequick/api/qquickwebenginesingleton_p.h
+++ b/src/webenginequick/api/qquickwebenginesingleton_p.h
@@ -63,7 +63,7 @@ class QQuickWebEngineProfile;
class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineSingleton : public QObject {
Q_OBJECT
Q_PROPERTY(QQuickWebEngineSettings* settings READ settings CONSTANT FINAL)
- Q_PROPERTY(QQuickWebEngineProfile* defaultProfile READ defaultProfile CONSTANT FINAL REVISION 1)
+ Q_PROPERTY(QQuickWebEngineProfile* defaultProfile READ defaultProfile CONSTANT FINAL REVISION(1,1))
public:
QQuickWebEngineSettings *settings() const;
QQuickWebEngineProfile *defaultProfile() const;
diff --git a/src/webenginequick/api/qquickwebengineview_p.h b/src/webenginequick/api/qquickwebengineview_p.h
index df5880e73..aba641de8 100644
--- a/src/webenginequick/api/qquickwebengineview_p.h
+++ b/src/webenginequick/api/qquickwebengineview_p.h
@@ -93,8 +93,6 @@ class QQuickWebEngineScriptCollection;
class QQuickWebEngineTestSupport;
#endif
-#define LATEST_WEBENGINEVIEW_REVISION 10
-
class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineView : public QQuickItem {
Q_OBJECT
Q_CLASSINFO("RegisterEnumClassesUnscoped", "false")
@@ -105,33 +103,33 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineView : public QQuickItem {
Q_PROPERTY(QString title READ title NOTIFY titleChanged FINAL)
Q_PROPERTY(bool canGoBack READ canGoBack NOTIFY canGoBackChanged FINAL)
Q_PROPERTY(bool canGoForward READ canGoForward NOTIFY canGoForwardChanged FINAL)
- Q_PROPERTY(bool isFullScreen READ isFullScreen NOTIFY isFullScreenChanged REVISION 1 FINAL)
- Q_PROPERTY(qreal zoomFactor READ zoomFactor WRITE setZoomFactor NOTIFY zoomFactorChanged REVISION 1 FINAL)
- Q_PROPERTY(QQuickWebEngineProfile *profile READ profile WRITE setProfile NOTIFY profileChanged FINAL REVISION 1)
- Q_PROPERTY(QQuickWebEngineSettings *settings READ settings REVISION 1 CONSTANT FINAL)
- Q_PROPERTY(QQuickWebEngineHistory *navigationHistory READ navigationHistory CONSTANT FINAL REVISION 1)
+ Q_PROPERTY(bool isFullScreen READ isFullScreen NOTIFY isFullScreenChanged REVISION(1,1) FINAL)
+ Q_PROPERTY(qreal zoomFactor READ zoomFactor WRITE setZoomFactor NOTIFY zoomFactorChanged REVISION(1,1) FINAL)
+ Q_PROPERTY(QQuickWebEngineProfile *profile READ profile WRITE setProfile NOTIFY profileChanged FINAL REVISION(1,1))
+ Q_PROPERTY(QQuickWebEngineSettings *settings READ settings REVISION(1,1) CONSTANT FINAL)
+ Q_PROPERTY(QQuickWebEngineHistory *navigationHistory READ navigationHistory CONSTANT FINAL REVISION(1,1))
#if QT_CONFIG(webengine_webchannel)
- Q_PROPERTY(QQmlWebChannel *webChannel READ webChannel WRITE setWebChannel NOTIFY webChannelChanged REVISION 1 FINAL)
+ Q_PROPERTY(QQmlWebChannel *webChannel READ webChannel WRITE setWebChannel NOTIFY webChannelChanged REVISION(1,1) FINAL)
#endif
- Q_PROPERTY(QQuickWebEngineScriptCollection *userScripts READ userScripts FINAL REVISION 1)
- Q_PROPERTY(bool activeFocusOnPress READ activeFocusOnPress WRITE setActiveFocusOnPress NOTIFY activeFocusOnPressChanged REVISION 2 FINAL)
- Q_PROPERTY(QColor backgroundColor READ backgroundColor WRITE setBackgroundColor NOTIFY backgroundColorChanged REVISION 2 FINAL)
- Q_PROPERTY(QSizeF contentsSize READ contentsSize NOTIFY contentsSizeChanged FINAL REVISION 3)
- Q_PROPERTY(QPointF scrollPosition READ scrollPosition NOTIFY scrollPositionChanged FINAL REVISION 3)
- Q_PROPERTY(bool audioMuted READ isAudioMuted WRITE setAudioMuted NOTIFY audioMutedChanged FINAL REVISION 3)
- Q_PROPERTY(bool recentlyAudible READ recentlyAudible NOTIFY recentlyAudibleChanged FINAL REVISION 3)
- Q_PROPERTY(uint webChannelWorld READ webChannelWorld WRITE setWebChannelWorld NOTIFY webChannelWorldChanged REVISION 3 FINAL)
-
- Q_PROPERTY(QQuickWebEngineView *inspectedView READ inspectedView WRITE setInspectedView NOTIFY inspectedViewChanged REVISION 7 FINAL)
- Q_PROPERTY(QQuickWebEngineView *devToolsView READ devToolsView WRITE setDevToolsView NOTIFY devToolsViewChanged REVISION 7 FINAL)
+ Q_PROPERTY(QQuickWebEngineScriptCollection *userScripts READ userScripts FINAL REVISION(1,1))
+ Q_PROPERTY(bool activeFocusOnPress READ activeFocusOnPress WRITE setActiveFocusOnPress NOTIFY activeFocusOnPressChanged REVISION(1,2) FINAL)
+ Q_PROPERTY(QColor backgroundColor READ backgroundColor WRITE setBackgroundColor NOTIFY backgroundColorChanged REVISION(1,2) FINAL)
+ Q_PROPERTY(QSizeF contentsSize READ contentsSize NOTIFY contentsSizeChanged FINAL REVISION(1,3))
+ Q_PROPERTY(QPointF scrollPosition READ scrollPosition NOTIFY scrollPositionChanged FINAL REVISION(1,3))
+ Q_PROPERTY(bool audioMuted READ isAudioMuted WRITE setAudioMuted NOTIFY audioMutedChanged FINAL REVISION(1,3))
+ Q_PROPERTY(bool recentlyAudible READ recentlyAudible NOTIFY recentlyAudibleChanged FINAL REVISION(1,3))
+ Q_PROPERTY(uint webChannelWorld READ webChannelWorld WRITE setWebChannelWorld NOTIFY webChannelWorldChanged REVISION(1,3) FINAL)
+
+ Q_PROPERTY(QQuickWebEngineView *inspectedView READ inspectedView WRITE setInspectedView NOTIFY inspectedViewChanged REVISION(1,7) FINAL)
+ Q_PROPERTY(QQuickWebEngineView *devToolsView READ devToolsView WRITE setDevToolsView NOTIFY devToolsViewChanged REVISION(1,7) FINAL)
#if QT_CONFIG(webenginequick_testsupport)
Q_PROPERTY(QQuickWebEngineTestSupport *testSupport READ testSupport WRITE setTestSupport NOTIFY testSupportChanged FINAL)
#endif
- Q_PROPERTY(LifecycleState lifecycleState READ lifecycleState WRITE setLifecycleState NOTIFY lifecycleStateChanged REVISION 10 FINAL)
- Q_PROPERTY(LifecycleState recommendedState READ recommendedState NOTIFY recommendedStateChanged REVISION 10 FINAL)
+ Q_PROPERTY(LifecycleState lifecycleState READ lifecycleState WRITE setLifecycleState NOTIFY lifecycleStateChanged REVISION(1,10) FINAL)
+ Q_PROPERTY(LifecycleState recommendedState READ recommendedState NOTIFY recommendedStateChanged REVISION(1,10) FINAL)
- Q_PROPERTY(qint64 renderProcessPid READ renderProcessPid NOTIFY renderProcessPidChanged FINAL REVISION 11)
+ Q_PROPERTY(qint64 renderProcessPid READ renderProcessPid NOTIFY renderProcessPidChanged FINAL REVISION(1,11))
public:
QQuickWebEngineView(QQuickItem *parent = nullptr);
@@ -478,7 +476,7 @@ public:
QQuickWebEngineHistory *navigationHistory() const;
uint webChannelWorld() const;
void setWebChannelWorld(uint);
- Q_REVISION(8) Q_INVOKABLE QQuickWebEngineAction *action(WebAction action);
+ Q_REVISION(1,8) Q_INVOKABLE QQuickWebEngineAction *action(WebAction action);
bool isAudioMuted() const;
void setAudioMuted(bool muted);
@@ -505,22 +503,22 @@ public:
public Q_SLOTS:
void runJavaScript(const QString&, const QJSValue & = QJSValue());
- Q_REVISION(3) void runJavaScript(const QString&, quint32 worldId, const QJSValue & = QJSValue());
+ Q_REVISION(1,3) void runJavaScript(const QString&, quint32 worldId, const QJSValue & = QJSValue());
void loadHtml(const QString &html, const QUrl &baseUrl = QUrl());
void goBack();
void goForward();
- Q_REVISION(1) void goBackOrForward(int index);
+ Q_REVISION(1,1) void goBackOrForward(int index);
void reload();
- Q_REVISION(1) void reloadAndBypassCache();
+ Q_REVISION(1,1) void reloadAndBypassCache();
void stop();
- Q_REVISION(1) void findText(const QString &subString, FindFlags options = { }, const QJSValue &callback = QJSValue());
- Q_REVISION(1) void fullScreenCancelled();
- Q_REVISION(1) void grantFeaturePermission(const QUrl &securityOrigin, Feature, bool granted);
- Q_REVISION(2) void setActiveFocusOnPress(bool arg);
- Q_REVISION(2) void triggerWebAction(WebAction action);
- Q_REVISION(3) void printToPdf(const QString &filePath, PrintedPageSizeId pageSizeId = PrintedPageSizeId::A4, PrintedPageOrientation orientation = PrintedPageOrientation::Portrait);
- Q_REVISION(3) void printToPdf(const QJSValue &callback, PrintedPageSizeId pageSizeId = PrintedPageSizeId::A4, PrintedPageOrientation orientation = PrintedPageOrientation::Portrait);
- Q_REVISION(4) void replaceMisspelledWord(const QString &replacement);
+ Q_REVISION(1,1) void findText(const QString &subString, FindFlags options = { }, const QJSValue &callback = QJSValue());
+ Q_REVISION(1,1) void fullScreenCancelled();
+ Q_REVISION(1,1) void grantFeaturePermission(const QUrl &securityOrigin, Feature, bool granted);
+ Q_REVISION(1,2) void setActiveFocusOnPress(bool arg);
+ Q_REVISION(1,2) void triggerWebAction(WebAction action);
+ Q_REVISION(1,3) void printToPdf(const QString &filePath, PrintedPageSizeId pageSizeId = PrintedPageSizeId::A4, PrintedPageOrientation orientation = PrintedPageOrientation::Portrait);
+ Q_REVISION(1,3) void printToPdf(const QJSValue &callback, PrintedPageSizeId pageSizeId = PrintedPageSizeId::A4, PrintedPageOrientation orientation = PrintedPageOrientation::Portrait);
+ Q_REVISION(1,4) void replaceMisspelledWord(const QString &replacement);
private Q_SLOTS:
void lazyInitialize();
@@ -534,44 +532,44 @@ Q_SIGNALS:
void linkHovered(const QUrl &hoveredUrl);
void navigationRequested(QQuickWebEngineNavigationRequest *request);
void javaScriptConsoleMessage(JavaScriptConsoleMessageLevel level, const QString &message, int lineNumber, const QString &sourceID);
- Q_REVISION(1) void certificateError(const QWebEngineCertificateError &error);
- Q_REVISION(1) void fullScreenRequested(const QWebEngineFullScreenRequest &request);
- Q_REVISION(1) void isFullScreenChanged();
- Q_REVISION(1) void featurePermissionRequested(const QUrl &securityOrigin, Feature feature);
- Q_REVISION(1) void newViewRequested(QQuickWebEngineNewViewRequest *request);
- Q_REVISION(1) void zoomFactorChanged(qreal arg);
- Q_REVISION(1) void profileChanged();
- Q_REVISION(1) void webChannelChanged();
- Q_REVISION(2) void activeFocusOnPressChanged(bool);
- Q_REVISION(2) void backgroundColorChanged();
- Q_REVISION(2) void renderProcessTerminated(RenderProcessTerminationStatus terminationStatus, int exitCode);
- Q_REVISION(2) void windowCloseRequested();
- Q_REVISION(3) void contentsSizeChanged(const QSizeF& size);
- Q_REVISION(3) void scrollPositionChanged(const QPointF& position);
- Q_REVISION(3) void audioMutedChanged(bool muted);
- Q_REVISION(3) void recentlyAudibleChanged(bool recentlyAudible);
- Q_REVISION(3) void webChannelWorldChanged(uint);
- Q_REVISION(4) void contextMenuRequested(QWebEngineContextMenuRequest *request);
- Q_REVISION(4) void authenticationDialogRequested(QQuickWebEngineAuthenticationDialogRequest *request);
- Q_REVISION(4) void javaScriptDialogRequested(QQuickWebEngineJavaScriptDialogRequest *request);
- Q_REVISION(4) void colorDialogRequested(QQuickWebEngineColorDialogRequest *request);
- Q_REVISION(4) void fileDialogRequested(QQuickWebEngineFileDialogRequest *request);
- Q_REVISION(4) void formValidationMessageRequested(QQuickWebEngineFormValidationMessageRequest *request);
- Q_REVISION(5) void pdfPrintingFinished(const QString &filePath, bool success);
- Q_REVISION(7) void quotaRequested(const QWebEngineQuotaRequest &request);
- Q_REVISION(7) void geometryChangeRequested(const QRect &geometry, const QRect &frameGeometry);
- Q_REVISION(7) void inspectedViewChanged();
- Q_REVISION(7) void devToolsViewChanged();
- Q_REVISION(7) void registerProtocolHandlerRequested(const QWebEngineRegisterProtocolHandlerRequest &request);
- Q_REVISION(8) void printRequested();
- Q_REVISION(9) void selectClientCertificate(QQuickWebEngineClientCertificateSelection *clientCertSelection);
- Q_REVISION(10) void tooltipRequested(QQuickWebEngineTooltipRequest *request);
- Q_REVISION(10) void lifecycleStateChanged(LifecycleState state);
- Q_REVISION(10) void recommendedStateChanged(LifecycleState state);
- Q_REVISION(10) void findTextFinished(const QWebEngineFindTextResult &result);
- Q_REVISION(11) void renderProcessPidChanged(qint64 pid);
- Q_REVISION(11) void canGoBackChanged();
- Q_REVISION(11) void canGoForwardChanged();
+ Q_REVISION(1,1) void certificateError(const QWebEngineCertificateError &error);
+ Q_REVISION(1,1) void fullScreenRequested(const QWebEngineFullScreenRequest &request);
+ Q_REVISION(1,1) void isFullScreenChanged();
+ Q_REVISION(1,1) void featurePermissionRequested(const QUrl &securityOrigin, Feature feature);
+ Q_REVISION(1,1) void newViewRequested(QQuickWebEngineNewViewRequest *request);
+ Q_REVISION(1,1) void zoomFactorChanged(qreal arg);
+ Q_REVISION(1,1) void profileChanged();
+ Q_REVISION(1,1) void webChannelChanged();
+ Q_REVISION(1,2) void activeFocusOnPressChanged(bool);
+ Q_REVISION(1,2) void backgroundColorChanged();
+ Q_REVISION(1,2) void renderProcessTerminated(RenderProcessTerminationStatus terminationStatus, int exitCode);
+ Q_REVISION(1,2) void windowCloseRequested();
+ Q_REVISION(1,3) void contentsSizeChanged(const QSizeF& size);
+ Q_REVISION(1,3) void scrollPositionChanged(const QPointF& position);
+ Q_REVISION(1,3) void audioMutedChanged(bool muted);
+ Q_REVISION(1,3) void recentlyAudibleChanged(bool recentlyAudible);
+ Q_REVISION(1,3) void webChannelWorldChanged(uint);
+ Q_REVISION(1,4) void contextMenuRequested(QWebEngineContextMenuRequest *request);
+ Q_REVISION(1,4) void authenticationDialogRequested(QQuickWebEngineAuthenticationDialogRequest *request);
+ Q_REVISION(1,4) void javaScriptDialogRequested(QQuickWebEngineJavaScriptDialogRequest *request);
+ Q_REVISION(1,4) void colorDialogRequested(QQuickWebEngineColorDialogRequest *request);
+ Q_REVISION(1,4) void fileDialogRequested(QQuickWebEngineFileDialogRequest *request);
+ Q_REVISION(1,4) void formValidationMessageRequested(QQuickWebEngineFormValidationMessageRequest *request);
+ Q_REVISION(1,5) void pdfPrintingFinished(const QString &filePath, bool success);
+ Q_REVISION(1,7) void quotaRequested(const QWebEngineQuotaRequest &request);
+ Q_REVISION(1,7) void geometryChangeRequested(const QRect &geometry, const QRect &frameGeometry);
+ Q_REVISION(1,7) void inspectedViewChanged();
+ Q_REVISION(1,7) void devToolsViewChanged();
+ Q_REVISION(1,7) void registerProtocolHandlerRequested(const QWebEngineRegisterProtocolHandlerRequest &request);
+ Q_REVISION(1,8) void printRequested();
+ Q_REVISION(1,9) void selectClientCertificate(QQuickWebEngineClientCertificateSelection *clientCertSelection);
+ Q_REVISION(1,10) void tooltipRequested(QQuickWebEngineTooltipRequest *request);
+ Q_REVISION(1,10) void lifecycleStateChanged(LifecycleState state);
+ Q_REVISION(1,10) void recommendedStateChanged(LifecycleState state);
+ Q_REVISION(1,10) void findTextFinished(const QWebEngineFindTextResult &result);
+ Q_REVISION(1,11) void renderProcessPidChanged(qint64 pid);
+ Q_REVISION(1,11) void canGoBackChanged();
+ Q_REVISION(1,11) void canGoForwardChanged();
#if QT_CONFIG(webenginequick_testsupport)
void testSupportChanged();