From 3716b0403622119046aa93937997f9eae67bb6ad Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Thu, 20 Dec 2018 16:40:06 +0100 Subject: [PATCH] using QVariant::userType instead of QVariant::type --- src/controls/QskSkinnable.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/controls/QskSkinnable.cpp b/src/controls/QskSkinnable.cpp index 52ff8d3d..b7178399 100644 --- a/src/controls/QskSkinnable.cpp +++ b/src/controls/QskSkinnable.cpp @@ -717,19 +717,21 @@ void QskSkinnable::startTransition( QskAspect::Aspect aspect, if ( control->window() == nullptr || !isTransitionAccepted( aspect ) ) return; - // We might be invalid for one of the values, when an aspect - // has not been defined for all states ( f.e. metrics are expected - // to fallback to 0.0 ). In this case we create a default one. + /* + We might be invalid for one of the values, when an aspect + has not been defined for all states ( f.e. metrics are expected + to fallback to 0.0 ). In this case we create a default one. + */ if ( !from.isValid() ) { - from = QVariant( to.type() ); + from = QVariant( to.userType(), nullptr ); } else if ( !to.isValid() ) { - to = QVariant( from.type() ); + to = QVariant( from.userType(), nullptr ); } - else if ( from.type() != to.type() ) + else if ( from.userType() != to.userType() ) { return; }