168492376
/
qskinny
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Qt6 incompatibilities

This commit is contained in:
Uwe Rathmann 2020-10-26 17:51:31 +01:00
parent 07cdcc56df
commit fc5a9f2038
2 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
playground/images/Image.cpp
View File

@ -124,24 +124,42 @@ void Image::itemChange( QQuickItem::ItemChange change,
} }
} }
#if QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 )
void Image::geometryChange(
const QRectF& newGeometry, const QRectF& oldGeometry )
{
Inherited::geometryChange( newGeometry, oldGeometry );
if ( newGeometry.size() != oldGeometry.size() )
adjustSourceSize( newGeometry.size() );
}
#else
void Image::geometryChanged( void Image::geometryChanged(
const QRectF& newGeometry, const QRectF& oldGeometry ) const QRectF& newGeometry, const QRectF& oldGeometry )
{ {
Inherited::geometryChanged( newGeometry, oldGeometry ); Inherited::geometryChanged( newGeometry, oldGeometry );
if ( newGeometry.size() != oldGeometry.size() ) if ( newGeometry.size() != oldGeometry.size() )
{ adjustSourceSize( newGeometry.size() );
}
#endif
void Image::adjustSourceSize( const QSizeF& size )
{
if ( m_data->sourceSizeAdjustment ) if ( m_data->sourceSizeAdjustment )
{ {
if ( m_data->deferredUpdates ) if ( m_data->deferredUpdates )
{ {
setImplicitSize( newGeometry.width(), newGeometry.height() ); setImplicitSize( size.width(), size.height() );
polish(); polish();
} }
else else
{ {
setSourceSize( newGeometry.size().toSize() ); setSourceSize( size.toSize() );
}
} }
} }
} }

6
playground/images/Image.h
View File

@ -59,7 +59,11 @@ class Image : public QQuickImage
void deferredUpdatesChanged(); void deferredUpdatesChanged();
protected: protected:
#if QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 )
void geometryChange( const QRectF&, const QRectF& ) override;
#else
void geometryChanged( const QRectF&, const QRectF& ) override; void geometryChanged( const QRectF&, const QRectF& ) override;
#endif
void itemChange( ItemChange, const ItemChangeData& ) override; void itemChange( ItemChange, const ItemChangeData& ) override;
void componentComplete() override; void componentComplete() override;
@ -67,6 +71,8 @@ class Image : public QQuickImage
void updatePolish() override; void updatePolish() override;
private: private:
void adjustSourceSize( const QSizeF& );
class PrivateData; class PrivateData;
std::unique_ptr< PrivateData > m_data; std::unique_ptr< PrivateData > m_data;
}; };