diff --git a/src/controls/QskControl.h b/src/controls/QskControl.h index fbc21fb4..e0155f70 100644 --- a/src/controls/QskControl.h +++ b/src/controls/QskControl.h @@ -48,6 +48,7 @@ class QSK_EXPORT QskControl : public QskQuickItem, public QskSkinnable Q_PROPERTY( QSizeF minimumSize READ minimumSize WRITE setMinimumSize ) Q_PROPERTY( QSizeF maximumSize READ maximumSize WRITE setMaximumSize ) Q_PROPERTY( QSizeF preferredSize READ preferredSize WRITE setPreferredSize ) + Q_PROPERTY( QSizeF sizeConstraint READ sizeConstraint ) using Inherited = QskQuickItem; diff --git a/src/controls/QskQuickItem.h b/src/controls/QskQuickItem.h index 9b91e30a..33c3efa1 100644 --- a/src/controls/QskQuickItem.h +++ b/src/controls/QskQuickItem.h @@ -18,6 +18,7 @@ class QSK_EXPORT QskQuickItem : public QQuickItem Q_OBJECT Q_PROPERTY( QRectF geometry READ geometry WRITE setGeometry ) + Q_PROPERTY( QRectF rect READ rect ) Q_PROPERTY( bool transparentForPositioners READ isTransparentForPositioner WRITE setTransparentForPositioner NOTIFY itemFlagsChanged ) @@ -44,9 +45,7 @@ class QSK_EXPORT QskQuickItem : public QQuickItem PreferRasterForTextures = 1 << 4, - DebugForceBackground = 1 << 7, - - LastFlag = DebugForceBackground + DebugForceBackground = 1 << 7 }; Q_ENUM( Flag ) diff --git a/src/controls/QskQuickItemPrivate.cpp b/src/controls/QskQuickItemPrivate.cpp index 427a58a0..1e1a5d41 100644 --- a/src/controls/QskQuickItemPrivate.cpp +++ b/src/controls/QskQuickItemPrivate.cpp @@ -67,7 +67,7 @@ void QskQuickItemPrivate::updateControlFlags( QskQuickItem::Flags flags ) Q_Q( QskQuickItem ); const auto numBits = qCountTrailingZeroBits( - static_cast< quint32 >( QskQuickItem::LastFlag ) ); + static_cast< quint32 >( QskQuickItem::DebugForceBackground ) ); for ( quint32 i = 0; i <= numBits; ++i ) {