diff options
| -rw-r--r-- | src/quicktemplates2/qquickabstractbutton_p.h | 3 | ||||
| -rw-r--r-- | src/quicktemplates2/qquickbuttongroup_p.h | 3 | ||||
| -rw-r--r-- | src/quicktemplates2/qquickcheckbox_p.h | 2 | ||||
| -rw-r--r-- | src/quicktemplates2/qquickscrollbar_p.h | 3 | ||||
| -rw-r--r-- | src/quicktemplates2/qquickspinbox_p.h | 3 |
5 files changed, 14 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickabstractbutton_p.h b/src/quicktemplates2/qquickabstractbutton_p.h index 81caed5a..78401d49 100644 --- a/src/quicktemplates2/qquickabstractbutton_p.h +++ b/src/quicktemplates2/qquickabstractbutton_p.h @@ -71,6 +71,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickAbstractButton : public QQuickContr Q_PROPERTY(QQuickIcon icon READ icon WRITE setIcon NOTIFY iconChanged FINAL REVISION 3) Q_PROPERTY(Display display READ display WRITE setDisplay NOTIFY displayChanged FINAL REVISION 3) Q_PROPERTY(QQuickAction *action READ action WRITE setAction NOTIFY actionChanged FINAL REVISION 3) + // 2.4 (Qt 5.11) Q_PROPERTY(int autoRepeatDelay READ autoRepeatDelay WRITE setAutoRepeatDelay NOTIFY autoRepeatDelayChanged FINAL REVISION 4) Q_PROPERTY(int autoRepeatInterval READ autoRepeatInterval WRITE setAutoRepeatInterval NOTIFY autoRepeatIntervalChanged FINAL REVISION 4) Q_PROPERTY(qreal pressX READ pressX NOTIFY pressXChanged FINAL REVISION 4) @@ -128,6 +129,7 @@ public: void setShortcut(const QKeySequence &shortcut); #endif + // 2.4 (Qt 5.11) int autoRepeatDelay() const; void setAutoRepeatDelay(int delay); @@ -161,6 +163,7 @@ Q_SIGNALS: Q_REVISION(3) void iconChanged(); Q_REVISION(3) void displayChanged(); Q_REVISION(3) void actionChanged(); + // 2.4 (Qt 5.11) Q_REVISION(4) void autoRepeatDelayChanged(); Q_REVISION(4) void autoRepeatIntervalChanged(); Q_REVISION(4) void pressXChanged(); diff --git a/src/quicktemplates2/qquickbuttongroup_p.h b/src/quicktemplates2/qquickbuttongroup_p.h index 30a09a62..84ddd225 100644 --- a/src/quicktemplates2/qquickbuttongroup_p.h +++ b/src/quicktemplates2/qquickbuttongroup_p.h @@ -67,6 +67,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickButtonGroup : public QObject, publi Q_PROPERTY(QQmlListProperty<QQuickAbstractButton> buttons READ buttons NOTIFY buttonsChanged FINAL) // 2.3 (Qt 5.10) Q_PROPERTY(bool exclusive READ isExclusive WRITE setExclusive NOTIFY exclusiveChanged FINAL REVISION 3) + // 2.4 (Qt 5.11) Q_PROPERTY(Qt::CheckState checkState READ checkState WRITE setCheckState NOTIFY checkStateChanged FINAL REVISION 4) Q_INTERFACES(QQmlParserStatus) @@ -84,6 +85,7 @@ public: bool isExclusive() const; void setExclusive(bool exclusive); + // 2.4 (Qt 5.11) Qt::CheckState checkState() const; void setCheckState(Qt::CheckState state); @@ -98,6 +100,7 @@ Q_SIGNALS: Q_REVISION(1) void clicked(QQuickAbstractButton *button); // 2.3 (Qt 5.10) Q_REVISION(3) void exclusiveChanged(); + // 2.4 (Qt 5.11) Q_REVISION(4) void checkStateChanged(); protected: diff --git a/src/quicktemplates2/qquickcheckbox_p.h b/src/quicktemplates2/qquickcheckbox_p.h index ecad2386..81bd680c 100644 --- a/src/quicktemplates2/qquickcheckbox_p.h +++ b/src/quicktemplates2/qquickcheckbox_p.h @@ -59,6 +59,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickCheckBox : public QQuickAbstractBut Q_OBJECT Q_PROPERTY(bool tristate READ isTristate WRITE setTristate NOTIFY tristateChanged FINAL) Q_PROPERTY(Qt::CheckState checkState READ checkState WRITE setCheckState NOTIFY checkStateChanged FINAL) + // 2.4 (Qt 5.11) Q_PRIVATE_PROPERTY(QQuickCheckBox::d_func(), QJSValue nextCheckState MEMBER nextCheckState WRITE setNextCheckState NOTIFY nextCheckStateChanged FINAL REVISION 4) public: @@ -73,6 +74,7 @@ public: Q_SIGNALS: void tristateChanged(); void checkStateChanged(); + // 2.4 (Qt 5.11) Q_REVISION(4) void nextCheckStateChanged(); protected: diff --git a/src/quicktemplates2/qquickscrollbar_p.h b/src/quicktemplates2/qquickscrollbar_p.h index 8f0b835d..5fad8240 100644 --- a/src/quicktemplates2/qquickscrollbar_p.h +++ b/src/quicktemplates2/qquickscrollbar_p.h @@ -71,6 +71,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickScrollBar : public QQuickControl // 2.3 (Qt 5.10) Q_PROPERTY(bool horizontal READ isHorizontal NOTIFY orientationChanged FINAL REVISION 3) Q_PROPERTY(bool vertical READ isVertical NOTIFY orientationChanged FINAL REVISION 3) + // 2.4 (Qt 5.11) Q_PROPERTY(qreal minimumSize READ minimumSize WRITE setMinimumSize NOTIFY minimumSizeChanged FINAL REVISION 4) Q_PROPERTY(qreal visualSize READ visualSize NOTIFY visualSizeChanged FINAL REVISION 4) Q_PROPERTY(qreal visualPosition READ visualPosition NOTIFY visualPositionChanged FINAL REVISION 4) @@ -124,6 +125,7 @@ public: bool isHorizontal() const; bool isVertical() const; + // 2.4 (Qt 5.11) qreal minimumSize() const; void setMinimumSize(qreal minimumSize); @@ -147,6 +149,7 @@ Q_SIGNALS: Q_REVISION(2) void snapModeChanged(); Q_REVISION(2) void interactiveChanged(); Q_REVISION(2) void policyChanged(); + // 2.4 (Qt 5.11) Q_REVISION(4) void minimumSizeChanged(); Q_REVISION(4) void visualSizeChanged(); Q_REVISION(4) void visualPositionChanged(); diff --git a/src/quicktemplates2/qquickspinbox_p.h b/src/quicktemplates2/qquickspinbox_p.h index 0d911962..8e537f72 100644 --- a/src/quicktemplates2/qquickspinbox_p.h +++ b/src/quicktemplates2/qquickspinbox_p.h @@ -76,6 +76,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickSpinBox : public QQuickControl Q_PROPERTY(bool inputMethodComposing READ isInputMethodComposing NOTIFY inputMethodComposingChanged FINAL REVISION 2) // 2.3 (Qt 5.10) Q_PROPERTY(bool wrap READ wrap WRITE setWrap NOTIFY wrapChanged FINAL REVISION 3) + // 2.4 (Qt 5.11) Q_PROPERTY(QString displayText READ displayText NOTIFY displayTextChanged FINAL REVISION 4) public: @@ -118,6 +119,7 @@ public: bool wrap() const; void setWrap(bool wrap); + // 2.4 (Qt 5.11) QString displayText() const; public Q_SLOTS: @@ -139,6 +141,7 @@ Q_SIGNALS: Q_REVISION(2) void inputMethodComposingChanged(); // 2.3 (Qt 5.10) Q_REVISION(3) void wrapChanged(); + // 2.4 (Qt 5.11) Q_REVISION(4) void displayTextChanged(); protected: |