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

Qt6 incompatibility fixed

Browse Source
This commit is contained in:
Uwe Rathmann 2020-10-23 14:00:27 +02:00
parent 205de91dae
commit 21bd75ae5b
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/controls/QskSkinnable.cpp
View File

@ -100,6 +100,17 @@ static inline bool qskCompareResolvedStates(
} }
} }
static inline QVariant qskTypedNullValue( const QVariant& value )
{
#if QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 )
const auto vType = static_cast< QMetaType >( value.userType() );
#else
const auto vType = value.userType();
#endif
return QVariant( vType, nullptr );
}
class QskSkinnable::PrivateData class QskSkinnable::PrivateData
{ {
public: public:
@ -788,11 +799,11 @@ void QskSkinnable::startTransition( QskAspect::Aspect aspect,
if ( !from.isValid() ) if ( !from.isValid() )
{ {
from = QVariant( to.userType(), nullptr ); from = qskTypedNullValue( to );
} }
else if ( !to.isValid() ) else if ( !to.isValid() )
{ {
to = QVariant( from.userType(), nullptr ); to = qskTypedNullValue( from );
} }
else if ( from.userType() != to.userType() ) else if ( from.userType() != to.userType() )
{ {