From cc7d84e09ed824af96aa5e59ba8f3a6522e7d7e6 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Mon, 2 Feb 2015 15:26:19 +0100 Subject: [PATCH] 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 --- src/gui/kernel/qstylehints.h | 18 +++++++++--------- 1 file 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);