diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-02-02 15:26:19 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-02-02 21:55:47 +0000 |
| commit | cc7d84e09ed824af96aa5e59ba8f3a6522e7d7e6 (patch) | |
| tree | 1819f2916554cfa2cab50091f7d59d79dfa6c151 /src/gui | |
| parent | d6e117e1d8b1b39311a5042fde762c475e884326 (diff) | |
QStyleHints: restore CONSTANT to non-NOTIFYable properties
The removal of CONSTANT keywords broke intended QML usage:
property string: Qt.styleHints.passwordMaskCharacter
and leads to such warnings:
QQmlExpression: Expression ... depends on non-NOTIFYable properties:
QStyleHints::passwordMaskCharacter
Change-Id: Iadc5ddcbe5c5704f146e073f514845426ff0ec4d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qstylehints.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/gui/kernel/qstylehints.h b/src/gui/kernel/qstylehints.h index de7a68018a..8afc41d2b3 100644 --- a/src/gui/kernel/qstylehints.h +++ b/src/gui/kernel/qstylehints.h @@ -47,19 +47,19 @@ class Q_GUI_EXPORT QStyleHints : public QObject Q_OBJECT Q_DECLARE_PRIVATE(QStyleHints) Q_PROPERTY(int cursorFlashTime READ cursorFlashTime NOTIFY cursorFlashTimeChanged FINAL) - Q_PROPERTY(qreal fontSmoothingGamma READ fontSmoothingGamma STORED false FINAL) - Q_PROPERTY(int keyboardAutoRepeatRate READ keyboardAutoRepeatRate STORED false FINAL) + Q_PROPERTY(qreal fontSmoothingGamma READ fontSmoothingGamma STORED false CONSTANT FINAL) + Q_PROPERTY(int keyboardAutoRepeatRate READ keyboardAutoRepeatRate STORED false CONSTANT FINAL) Q_PROPERTY(int keyboardInputInterval READ keyboardInputInterval NOTIFY keyboardInputIntervalChanged FINAL) Q_PROPERTY(int mouseDoubleClickInterval READ mouseDoubleClickInterval NOTIFY mouseDoubleClickIntervalChanged FINAL) - Q_PROPERTY(int mousePressAndHoldInterval READ mousePressAndHoldInterval STORED false FINAL) - Q_PROPERTY(QChar passwordMaskCharacter READ passwordMaskCharacter STORED false FINAL) - Q_PROPERTY(int passwordMaskDelay READ passwordMaskDelay STORED false FINAL) - Q_PROPERTY(bool setFocusOnTouchRelease READ setFocusOnTouchRelease STORED false FINAL) - Q_PROPERTY(bool showIsFullScreen READ showIsFullScreen STORED false FINAL) + Q_PROPERTY(int mousePressAndHoldInterval READ mousePressAndHoldInterval STORED false CONSTANT FINAL) + Q_PROPERTY(QChar passwordMaskCharacter READ passwordMaskCharacter STORED false CONSTANT FINAL) + Q_PROPERTY(int passwordMaskDelay READ passwordMaskDelay STORED false CONSTANT FINAL) + Q_PROPERTY(bool setFocusOnTouchRelease READ setFocusOnTouchRelease STORED false CONSTANT FINAL) + Q_PROPERTY(bool showIsFullScreen READ showIsFullScreen STORED false CONSTANT FINAL) Q_PROPERTY(int startDragDistance READ startDragDistance NOTIFY startDragDistanceChanged FINAL) Q_PROPERTY(int startDragTime READ startDragTime NOTIFY startDragTimeChanged FINAL) - Q_PROPERTY(int startDragVelocity READ startDragVelocity STORED false FINAL) - Q_PROPERTY(bool useRtlExtensions READ useRtlExtensions STORED false FINAL) + Q_PROPERTY(int startDragVelocity READ startDragVelocity STORED false CONSTANT FINAL) + Q_PROPERTY(bool useRtlExtensions READ useRtlExtensions STORED false CONSTANT FINAL) public: void setMouseDoubleClickInterval(int mouseDoubleClickInterval); |