From afe4433ae7af5491a19e85d69dce1caa93c33cca Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Fri, 22 May 2015 20:39:11 +0200 Subject: Theme: fix int->real Change-Id: I9833aee821e4c7d436e0c999dbeefe3e12b34875 Reviewed-by: J-P Nurmi --- src/imports/controls/qquicktheme_p.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/imports/controls/qquicktheme_p.h') diff --git a/src/imports/controls/qquicktheme_p.h b/src/imports/controls/qquicktheme_p.h index f3e3d38c..a6294c78 100644 --- a/src/imports/controls/qquicktheme_p.h +++ b/src/imports/controls/qquicktheme_p.h @@ -71,9 +71,9 @@ class QQuickTheme : public QObject Q_PROPERTY(QColor selectionColor READ selectionColor WRITE setSelectionColor RESET resetSelectionColor NOTIFY selectionColorChanged FINAL) Q_PROPERTY(QColor shadowColor READ shadowColor WRITE setShadowColor RESET resetShadowColor NOTIFY shadowColorChanged FINAL) Q_PROPERTY(QColor textColor READ textColor WRITE setTextColor RESET resetTextColor NOTIFY textColorChanged FINAL) - Q_PROPERTY(int padding READ padding WRITE setPadding RESET resetPadding NOTIFY paddingChanged FINAL) - Q_PROPERTY(int roundness READ roundness WRITE setRoundness RESET resetRoundness NOTIFY roundnessChanged FINAL) - Q_PROPERTY(int spacing READ spacing WRITE setSpacing RESET resetSpacing NOTIFY spacingChanged FINAL) + Q_PROPERTY(qreal padding READ padding WRITE setPadding RESET resetPadding NOTIFY paddingChanged FINAL) + Q_PROPERTY(qreal roundness READ roundness WRITE setRoundness RESET resetRoundness NOTIFY roundnessChanged FINAL) + Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing RESET resetSpacing NOTIFY spacingChanged FINAL) Q_PROPERTY(qreal disabledOpacity READ disabledOpacity WRITE setDisabledOpacity RESET resetDisabledOpacity NOTIFY disabledOpacityChanged FINAL) public: @@ -129,16 +129,16 @@ public: void setTextColor(const QColor &color); void resetTextColor(); - int padding() const; - void setPadding(int padding); + qreal padding() const; + void setPadding(qreal padding); void resetPadding(); - int roundness() const; - void setRoundness(int roundness); + qreal roundness() const; + void setRoundness(qreal roundness); void resetRoundness(); - int spacing() const; - void setSpacing(int spacing); + qreal spacing() const; + void setSpacing(qreal spacing); void resetSpacing(); qreal disabledOpacity() const; -- cgit v1.2.3