From 2700bcd5dd5d254917dfe27e1718303570b8816e Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias.kuhn@gmx.ch>
Date: Sun, 25 May 2014 17:40:53 +0200
Subject: [PATCH] Fix widget to wrapper converter code Fixes #10337

---
 src/gui/editorwidgets/core/qgseditorwidgetwrapper.cpp | 2 +-
 src/gui/editorwidgets/core/qgswidgetwrapper.cpp       | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/gui/editorwidgets/core/qgseditorwidgetwrapper.cpp b/src/gui/editorwidgets/core/qgseditorwidgetwrapper.cpp
index c581cd6c7e7..d44b8db7801 100644
--- 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
index ce870c55351..9ca1a18bafa 100644
--- 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 )