Fix breaking tests

qgis · Jan 8, 2021 · 7708569 · 7708569
1 parent ebddedd
commit 7708569
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/python/gui/auto_generated/qgsabstractrelationeditorwidget.sip.in b/python/gui/auto_generated/qgsabstractrelationeditorwidget.sip.in
@@ -62,7 +62,7 @@ inserting and deleting entries on the intermediate table as required.
 Sets the ``feature`` being edited and updates the UI unless ``update`` is set to ``False``
 %End
 
-    void setEditorContext( const QgsAttributeEditorContext &context );
+    virtual void setEditorContext( const QgsAttributeEditorContext &context );
 %Docstring
 Sets the editor ``context``
 

diff --git a/python/gui/auto_generated/qgsrelationeditorwidget.sip.in b/python/gui/auto_generated/qgsrelationeditorwidget.sip.in
@@ -72,7 +72,8 @@ The feature selection manager is responsible for the selected features
 which are currently being edited.
 %End
 
-    void setEditorContext( const QgsAttributeEditorContext &context );
+    virtual void setEditorContext( const QgsAttributeEditorContext &context );
+
 %Docstring
 Sets the editor ``context``
 

diff --git a/src/gui/editorwidgets/qgsrelationwidgetwrapper.cpp b/src/gui/editorwidgets/qgsrelationwidgetwrapper.cpp
@@ -190,9 +190,8 @@ void QgsRelationWidgetWrapper::initWidget( QWidget *editor )
   }
   while ( ctx );
 
-  w->setRelations( mRelation, mNmRelation );
-
   w->setEditorContext( myContext );
+  w->setRelations( mRelation, mNmRelation );
 
   mWidget = w;
 }

diff --git a/src/gui/qgsabstractrelationeditorwidget.h b/src/gui/qgsabstractrelationeditorwidget.h
@@ -101,7 +101,7 @@ class GUI_EXPORT QgsAbstractRelationEditorWidget : public QWidget
      * \note if context cadDockWidget is null, it won't be possible to digitize
      * the geometry of a referencing feature from this widget
      */
-    void setEditorContext( const QgsAttributeEditorContext &context );
+    virtual void setEditorContext( const QgsAttributeEditorContext &context );
 
     /**
      * Returns the attribute editor context.

diff --git a/src/gui/qgsrelationeditorwidget.h b/src/gui/qgsrelationeditorwidget.h
@@ -136,7 +136,7 @@ class GUI_EXPORT QgsRelationEditorWidget : public QgsAbstractRelationEditorWidge
      * \note if context cadDockWidget is null, it won't be possible to digitize
      * the geometry of a referencing feature from this widget
      */
-    void setEditorContext( const QgsAttributeEditorContext &context );
+    void setEditorContext( const QgsAttributeEditorContext &context ) override;
 
     /**
      * Defines the buttons which are shown