From fe98439bd67fea98762b320d3d0cfdd5e89e16e0 Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Fri, 17 Jan 2020 13:58:15 +0100 Subject: [PATCH] qskItemSize added for Qt < 5.10 --- src/controls/QskQuick.cpp | 7 +++++++ src/controls/QskQuick.h | 1 + src/controls/QskQuickItem.h | 6 ++++++ 3 files changed, 14 insertions(+) diff --git a/src/controls/QskQuick.cpp b/src/controls/QskQuick.cpp index 77ecf29c..ea3c231a 100644 --- a/src/controls/QskQuick.cpp +++ b/src/controls/QskQuick.cpp @@ -16,6 +16,13 @@ QSK_QT_PRIVATE_END #include #include +QSizeF qskItemSize( const QQuickItem* item ) +{ + // obsolete for Qt >= 5.10 + auto d = QQuickItemPrivate::get( item ); + return QSizeF( d->width, d->height ); +} + QRectF qskItemRect( const QQuickItem* item ) { auto d = QQuickItemPrivate::get( item ); diff --git a/src/controls/QskQuick.h b/src/controls/QskQuick.h index 0f723f5d..be88501f 100644 --- a/src/controls/QskQuick.h +++ b/src/controls/QskQuick.h @@ -48,6 +48,7 @@ QSK_EXPORT QskSizePolicy qskSizePolicy( const QQuickItem* ); QSK_EXPORT Qt::Alignment qskLayoutAlignmentHint( const QQuickItem* ); QSK_EXPORT bool qskRetainSizeWhenHidden( const QQuickItem* ); +QSK_EXPORT QSizeF qskItemSize( const QQuickItem* ); QSK_EXPORT QRectF qskItemRect( const QQuickItem* ); QSK_EXPORT QRectF qskItemGeometry( const QQuickItem* ); diff --git a/src/controls/QskQuickItem.h b/src/controls/QskQuickItem.h index f4bb69b2..18af8457 100644 --- a/src/controls/QskQuickItem.h +++ b/src/controls/QskQuickItem.h @@ -57,7 +57,9 @@ class QSK_EXPORT QskQuickItem : public QQuickItem QRectF geometry() const; QRectF rect() const; +#if QT_VERSION < QT_VERSION_CHECK( 5, 10, 0 ) QSizeF size() const; +#endif QSizeF implicitSize() const; void setGeometry( qreal x, qreal y, qreal width, qreal height ); @@ -148,11 +150,15 @@ inline void QskQuickItem::setGeometry( const QRectF& rect ) setGeometry( rect.x(), rect.y(), rect.width(), rect.height() ); } +#if QT_VERSION < QT_VERSION_CHECK( 5, 10, 0 ) + inline QSizeF QskQuickItem::size() const { return QSizeF( width(), height() ); } +#endif + inline QSizeF QskQuickItem::implicitSize() const { return QSizeF( implicitWidth(), implicitHeight() );