summaryrefslogtreecommitdiff
path: root/src/controls/Private/qquickstyleitem_p.h
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@digia.com>2013-09-16 16:58:59 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-25 15:00:00 +0200
commit77c3f0e33edf5b6031d2460f1760b51359de7db6 (patch)
tree27cd5d445e098409dcc1cf6800ee7b29e6c97c39 /src/controls/Private/qquickstyleitem_p.h
parentaba6546f9b25d459205ebfa4f191300a08a34eee (diff)
downloadqtquickcontrols-77c3f0e33edf5b6031d2460f1760b51359de7db6.tar.gz
QML Base style: support transient scrollbars
Change-Id: I4bcbf80f382ad8e972c302a6144c5b42a28f936d Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'src/controls/Private/qquickstyleitem_p.h')
-rw-r--r--src/controls/Private/qquickstyleitem_p.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/Private/qquickstyleitem_p.h b/src/controls/Private/qquickstyleitem_p.h
index 336d3b46..3d67776f 100644
--- a/src/controls/Private/qquickstyleitem_p.h
+++ b/src/controls/Private/qquickstyleitem_p.h
@@ -62,7 +62,7 @@ class QQuickStyleItem: public QQuickItem
Q_PROPERTY( bool on READ on WRITE setOn NOTIFY onChanged)
Q_PROPERTY( bool hover READ hover WRITE setHover NOTIFY hoverChanged)
Q_PROPERTY( bool horizontal READ horizontal WRITE setHorizontal NOTIFY horizontalChanged)
- Q_PROPERTY( bool transient READ transient WRITE setTransient NOTIFY transientChanged)
+ Q_PROPERTY( bool isTransient READ isTransient WRITE setTransient NOTIFY transientChanged)
Q_PROPERTY( QString elementType READ elementType WRITE setElementType NOTIFY elementTypeChanged)
Q_PROPERTY( QString text READ text WRITE setText NOTIFY textChanged)
@@ -131,7 +131,7 @@ public:
bool on() const { return m_on; }
bool hover() const { return m_hover; }
bool horizontal() const { return m_horizontal; }
- bool transient() const { return m_transient; }
+ bool isTransient() const { return m_transient; }
int minimum() const { return m_minimum; }
int maximum() const { return m_maximum; }