From e593ab107cd57e100a2d261389b1e30d4061eb58 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Sun, 10 Jan 2021 18:05:11 +0100 Subject: [PATCH 1/3] Enable custom widget builds in ci --- .ci/qt5_14/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.ci/qt5_14/build.sh b/.ci/qt5_14/build.sh index 077a16a4cf13..eef52701ddcb 100755 --- 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 \ From 3a3f7c5009e0f1d52c1ddbcd3acc18d9cebb0175 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Sun, 10 Jan 2021 18:10:21 +0100 Subject: [PATCH 2/3] Fix build --- src/customwidgets/qgsrelationeditorwidgetplugin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/customwidgets/qgsrelationeditorwidgetplugin.cpp b/src/customwidgets/qgsrelationeditorwidgetplugin.cpp index 657a57904198..eab0727cecb8 100644 --- 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 From 472898ac92a91221fa42d49e60a88f3fa25d92d9 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Sun, 10 Jan 2021 22:10:31 +0100 Subject: [PATCH 3/3] Fix docker build successful check --- .github/workflows/build-docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index 63a3e68160eb..3d893393fbb0 100644 --- 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