diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2020-01-20 11:38:26 +0100 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-02-17 14:12:17 +0100 |
commit | 8b64327217c6cf7cdc10f4a5122b066abacb8936 (patch) | |
tree | 57975a72413614bc6edd7abe574f874d06019154 /src | |
parent | f2bbc9c69f5265986dd5574a790e189a7a126c61 (diff) |
Add major versions to REVISION and Q_REVSION markers
Statemachine had major version 1 in Qt5, and window had major version 2.
Change-Id: I24cc6de5ca9270c61e0dba7d1ee6a61ef84b3018
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/corelib/statemachine/qabstracttransition.h | 2 | ||||
-rw-r--r-- | src/gui/kernel/qwindow.h | 24 |
2 files changed, 13 insertions, 13 deletions
diff --git a/src/corelib/statemachine/qabstracttransition.h b/src/corelib/statemachine/qabstracttransition.h index 18e12d3eb6..357e829b6a 100644 --- a/src/corelib/statemachine/qabstracttransition.h +++ b/src/corelib/statemachine/qabstracttransition.h @@ -64,7 +64,7 @@ class Q_CORE_EXPORT QAbstractTransition : public QObject Q_PROPERTY(QState* sourceState READ sourceState) Q_PROPERTY(QAbstractState* targetState READ targetState WRITE setTargetState NOTIFY targetStateChanged) Q_PROPERTY(QList<QAbstractState*> targetStates READ targetStates WRITE setTargetStates NOTIFY targetStatesChanged) - Q_PROPERTY(TransitionType transitionType READ transitionType WRITE setTransitionType REVISION 1) + Q_PROPERTY(TransitionType transitionType READ transitionType WRITE setTransitionType REVISION(1, 1)) public: enum TransitionType { ExternalTransition, diff --git a/src/gui/kernel/qwindow.h b/src/gui/kernel/qwindow.h index 7aae7ffffa..de6d7ffd31 100644 --- a/src/gui/kernel/qwindow.h +++ b/src/gui/kernel/qwindow.h @@ -119,11 +119,11 @@ class Q_GUI_EXPORT QWindow : public QObject, public QSurface Q_PROPERTY(int maximumWidth READ maximumWidth WRITE setMaximumWidth NOTIFY maximumWidthChanged) Q_PROPERTY(int maximumHeight READ maximumHeight WRITE setMaximumHeight NOTIFY maximumHeightChanged) Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged) - Q_PROPERTY(bool active READ isActive NOTIFY activeChanged REVISION 1) - Q_PROPERTY(Visibility visibility READ visibility WRITE setVisibility NOTIFY visibilityChanged REVISION 1) + Q_PROPERTY(bool active READ isActive NOTIFY activeChanged REVISION(2, 1)) + Q_PROPERTY(Visibility visibility READ visibility WRITE setVisibility NOTIFY visibilityChanged REVISION(2, 1)) Q_PROPERTY(Qt::ScreenOrientation contentOrientation READ contentOrientation WRITE reportContentOrientationChange NOTIFY contentOrientationChanged) - Q_PROPERTY(qreal opacity READ opacity WRITE setOpacity NOTIFY opacityChanged REVISION 1) - Q_PRIVATE_PROPERTY(QWindow::d_func(), QWindow* transientParent MEMBER transientParent WRITE setTransientParent NOTIFY transientParentChanged REVISION 13) + Q_PROPERTY(qreal opacity READ opacity WRITE setOpacity NOTIFY opacityChanged REVISION(2, 1)) + Q_PRIVATE_PROPERTY(QWindow::d_func(), QWindow* transientParent MEMBER transientParent WRITE setTransientParent NOTIFY transientParentChanged REVISION(2, 13)) public: enum Visibility { @@ -277,7 +277,7 @@ public: #endif public Q_SLOTS: - Q_REVISION(1) void requestActivate(); + Q_REVISION(2, 1) void requestActivate(); void setVisible(bool visible); @@ -309,15 +309,15 @@ public Q_SLOTS: void setMaximumWidth(int w); void setMaximumHeight(int h); - Q_REVISION(1) void alert(int msec); + Q_REVISION(2, 1) void alert(int msec); - Q_REVISION(3) void requestUpdate(); + Q_REVISION(2 ,3) void requestUpdate(); Q_SIGNALS: void screenChanged(QScreen *screen); void modalityChanged(Qt::WindowModality modality); void windowStateChanged(Qt::WindowState windowState); - Q_REVISION(2) void windowTitleChanged(const QString &title); + Q_REVISION(2, 2) void windowTitleChanged(const QString &title); void xChanged(int arg); void yChanged(int arg); @@ -331,15 +331,15 @@ Q_SIGNALS: void maximumHeightChanged(int arg); void visibleChanged(bool arg); - Q_REVISION(1) void visibilityChanged(QWindow::Visibility visibility); - Q_REVISION(1) void activeChanged(); + Q_REVISION(2, 1) void visibilityChanged(QWindow::Visibility visibility); + Q_REVISION(2, 1) void activeChanged(); void contentOrientationChanged(Qt::ScreenOrientation orientation); void focusObjectChanged(QObject *object); - Q_REVISION(1) void opacityChanged(qreal opacity); + Q_REVISION(2, 1) void opacityChanged(qreal opacity); - Q_REVISION(13) void transientParentChanged(QWindow *transientParent); + Q_REVISION(2, 13) void transientParentChanged(QWindow *transientParent); protected: virtual void exposeEvent(QExposeEvent *); |