From 96f57e62ce843ff8c5757759bbbb1a504f9689f5 Mon Sep 17 00:00:00 2001 From: Szabolcs David Date: Mon, 6 Mar 2017 08:41:20 -0800 Subject: Add FINALs and explicit constructor to QQuickWebEngineScript Deriving from this class is not expected. Change-Id: I75be53358292fbcdc813fc6d48b21362f1cc3f16 Reviewed-by: Allan Sandfeld Jensen --- src/webengine/api/qquickwebenginescript.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/webengine') diff --git a/src/webengine/api/qquickwebenginescript.h b/src/webengine/api/qquickwebenginescript.h index 2cd4fadf1..0b28d4c55 100644 --- a/src/webengine/api/qquickwebenginescript.h +++ b/src/webengine/api/qquickwebenginescript.h @@ -51,12 +51,12 @@ class QQuickWebEngineView; class Q_WEBENGINE_EXPORT QQuickWebEngineScript : public QObject { Q_OBJECT - Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged) - Q_PROPERTY(QUrl sourceUrl READ sourceUrl WRITE setSourceUrl NOTIFY sourceUrlChanged) - Q_PROPERTY(QString sourceCode READ sourceCode WRITE setSourceCode NOTIFY sourceCodeChanged) - Q_PROPERTY(InjectionPoint injectionPoint READ injectionPoint WRITE setInjectionPoint NOTIFY injectionPointChanged) - Q_PROPERTY(ScriptWorldId worldId READ worldId WRITE setWorldId NOTIFY worldIdChanged) - Q_PROPERTY(bool runOnSubframes READ runOnSubframes WRITE setRunOnSubframes NOTIFY runOnSubframesChanged) + Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged FINAL) + Q_PROPERTY(QUrl sourceUrl READ sourceUrl WRITE setSourceUrl NOTIFY sourceUrlChanged FINAL) + Q_PROPERTY(QString sourceCode READ sourceCode WRITE setSourceCode NOTIFY sourceCodeChanged FINAL) + Q_PROPERTY(InjectionPoint injectionPoint READ injectionPoint WRITE setInjectionPoint NOTIFY injectionPointChanged FINAL) + Q_PROPERTY(ScriptWorldId worldId READ worldId WRITE setWorldId NOTIFY worldIdChanged FINAL) + Q_PROPERTY(bool runOnSubframes READ runOnSubframes WRITE setRunOnSubframes NOTIFY runOnSubframesChanged FINAL) public: @@ -74,7 +74,7 @@ public: }; Q_ENUM(ScriptWorldId) - QQuickWebEngineScript(QObject *parent = Q_NULLPTR); + explicit QQuickWebEngineScript(QObject *parent = Q_NULLPTR); ~QQuickWebEngineScript(); Q_INVOKABLE QString toString() const; -- cgit v1.2.3