Merge pull request #40929 from m-kuhn/fixRelationCustomWidget

Enable custom widget builds in ci and fix the build
qgis · Jan 11, 2021 · 09f4f4c65a5d4ccdd44e22e6bfb2ea4c73794999 · 09f4f4c
2 parents 12a7afb + 472898a
commit 09f4f4c65a5d4ccdd44e22e6bfb2ea4c73794999
Unified Split

Showing with 3 additions and 2 deletions.

+1 −0 .ci/qt5_14/build.sh

+1 −1 .github/workflows/build-docker.yml

+1 −1 src/customwidgets/qgsrelationeditorwidgetplugin.cpp
diff --git a/.ci/qt5_14/build.sh b/.ci/qt5_14/build.sh
@@ -19,6 +19,7 @@ cmake -GNinja \
  -DWITH_QWTPOLAR=OFF \
  -DWITH_APIDOC=OFF \
  -DWITH_ASTYLE=OFF \
+ -DWITH_CUSTOM_WIDGETS=ON \
  -DWITH_DESKTOP=ON \
  -DWITH_BINDINGS=ON \
  -DWITH_SERVER=ON \

diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
@@ -73,7 +73,7 @@ jobs:
           docker run --name qgis_container qgis/qgis:BUILDER /bin/true
           docker cp qgis_container:/QGIS/build_exit_value ./build_exit_value
 
-          if [[ $(cat ./build_exit_value) -ne "OK" ]]; then
+          if [[ $(cat ./build_exit_value) != "OK" ]]; then
             echo "Build failed, not pushing image"
             exit 1
           fi

diff --git a/src/customwidgets/qgsrelationeditorwidgetplugin.cpp b/src/customwidgets/qgsrelationeditorwidgetplugin.cpp
@@ -52,7 +52,7 @@ bool QgsRelationEditorWidgetPlugin::isContainer() const
 
 QWidget *QgsRelationEditorWidgetPlugin::createWidget( QWidget *parent )
 {
-  return new QgsRelationEditorWidget( parent );
+  return new QgsRelationEditorWidget( QVariantMap(), parent );
 }
 
 bool QgsRelationEditorWidgetPlugin::isInitialized() const