Fix widget to wrapper converter code

Fixes #10337
qgis · May 25, 2014 · 2700bcd · 2700bcd
1 parent 2c51dcb
commit 2700bcd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/src/gui/editorwidgets/core/qgseditorwidgetwrapper.cpp b/src/gui/editorwidgets/core/qgseditorwidgetwrapper.cpp
@@ -37,7 +37,7 @@ QgsField QgsEditorWidgetWrapper::field()
 
 QgsEditorWidgetWrapper* QgsEditorWidgetWrapper::fromWidget( QWidget* widget )
 {
-  return widget->property( "EWV2Wrapper" ).value<QgsEditorWidgetWrapper*>();
+  return qobject_cast<QgsEditorWidgetWrapper*>( widget->property( "EWV2Wrapper" ).value<QgsWidgetWrapper*>() );
 }
 
 void QgsEditorWidgetWrapper::setFeature( const QgsFeature& feature )

diff --git a/src/gui/editorwidgets/core/qgswidgetwrapper.cpp b/src/gui/editorwidgets/core/qgswidgetwrapper.cpp
@@ -31,7 +31,7 @@ QWidget* QgsWidgetWrapper::widget()
   if ( !mWidget )
   {
     mWidget = createWidget( mParent );
-    mWidget->setProperty( "EWV2Wrapper", QVariant::fromValue( this ) );
+    mWidget->setProperty( "EWV2Wrapper", QVariant::fromValue<QgsWidgetWrapper*>( this ) );
     initWidget( mWidget );
   }
 
@@ -41,12 +41,6 @@ QWidget* QgsWidgetWrapper::widget()
 void QgsWidgetWrapper::setConfig( const QgsEditorWidgetConfig& config )
 {
   mConfig = config;
-  // If an editor widget was supplied, we can initialize this now
-  if ( mWidget )
-  {
-    mWidget->setProperty( "EWV2Wrapper", QVariant::fromValue( this ) );
-    initWidget( mWidget );
-  }
 }
 
 void QgsWidgetWrapper::setContext( const QgsAttributeEditorContext& context )