r18567 by craig - #11795: Fix QVariant conversion test

[scribus-commit]

Author: craig
Date: Mon Oct 21 19:27:04 2013
New Revision: 18567

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18567
Log:
#11795: Fix QVariant conversion test

Modified:
    trunk/Scribus/scribus/plugins/scripter/scripterimpl.cpp

Modified: trunk/Scribus/scribus/plugins/scripter/scripterimpl.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18567&path=/trunk/Scribus/scribus/plugins/scripter/scripterimpl.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scripter/scripterimpl.cpp (original)
+++ trunk/Scribus/scribus/plugins/scripter/scripterimpl.cpp Mon Oct 21 19:27:04 2013
@@ -91,12 +91,12 @@
 QObject *ScripterImpl::fromVariant(const QVariant& v)
 {
 
-	if (qVariantCanConvert< QWidget* >(v))
+	if (v.canConvert< QWidget* >())
 	{
 		QObject* obj = qvariant_cast< QWidget* >(v);
 		return obj;
 	}
-	else if (qVariantCanConvert< QObject* >(v))
+	else if (v.canConvert< QObject* >())
 	{
 		QObject* obj = qvariant_cast< QObject* >(v);
 		return obj;