diff --git a/examples/thumbnails/main.cpp b/examples/thumbnails/main.cpp index e267cd32..9944871d 100644 --- a/examples/thumbnails/main.cpp +++ b/examples/thumbnails/main.cpp @@ -158,7 +158,7 @@ class IconGrid : public QskLinearBox const int dim = dimension(); // we know, that all items have the same size - const auto itemSize = qskItemSize( itemAtIndex( 0 ) ); + const auto itemSize = itemAtIndex( 0 )->size(); const int rowMin = rect.top() / ( itemSize.height() + spacing() ); const int rowMax = rect.bottom() / ( itemSize.height() + spacing() ); diff --git a/src/controls/QskQuick.cpp b/src/controls/QskQuick.cpp index 6f71bca4..b44eef1b 100644 --- a/src/controls/QskQuick.cpp +++ b/src/controls/QskQuick.cpp @@ -16,13 +16,6 @@ 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 ); @@ -41,7 +34,7 @@ void qskSetItemGeometry( QQuickItem* item, const QRectF& rect ) { control->setGeometry( rect ); } - else + else if ( item ) { item->setPosition( rect.topLeft() ); item->setSize( rect.size() ); @@ -63,10 +56,10 @@ bool qskIsAncestorOf( const QQuickItem* item, const QQuickItem* child ) bool qskIsVisibleToParent( const QQuickItem* item ) { - if ( item ) - return QQuickItemPrivate::get( item )->explicitVisible; + if ( item == nullptr ) + return false; - return false; + return QQuickItemPrivate::get( item )->explicitVisible; } bool qskIsVisibleTo( const QQuickItem* item, const QQuickItem* ancestor ) diff --git a/src/controls/QskQuick.h b/src/controls/QskQuick.h index 74d29b6b..bf35eb93 100644 --- a/src/controls/QskQuick.h +++ b/src/controls/QskQuick.h @@ -48,7 +48,6 @@ 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/QskScrollArea.cpp b/src/controls/QskScrollArea.cpp index e2078c2b..7f0ba937 100644 --- a/src/controls/QskScrollArea.cpp +++ b/src/controls/QskScrollArea.cpp @@ -500,7 +500,7 @@ QSizeF QskScrollArea::layoutSizeHint( Qt::SizeHint which, const QSizeF& constrai } else { - hint = qskItemSize( contentItem ); + hint = contentItem->size(); } if ( verticalScrollBarPolicy() != Qt::ScrollBarAlwaysOff )