fix build with Qt < 5.12

qgis · Jul 13, 2020 · 56bfeac · 56bfeac
1 parent 89f9e6b
commit 56bfeac
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/python/core/auto_additions/qgsattributeeditorelement.py b/python/core/auto_additions/qgsattributeeditorelement.py
@@ -11,6 +11,5 @@
 QgsAttributeEditorRelation.Button.__doc__ = 'Possible buttons shown in the relation editor\n\n.. versionadded:: 3.16\n\n' + '* ``Link``: ' + QgsAttributeEditorRelation.Button.Link.__doc__ + '\n' + '* ``Unlink``: ' + QgsAttributeEditorRelation.Button.Unlink.__doc__ + '\n' + '* ``SaveChildEdits``: ' + QgsAttributeEditorRelation.Button.SaveChildEdits.__doc__ + '\n' + '* ``AddChildFeature``: ' + QgsAttributeEditorRelation.Button.AddChildFeature.__doc__ + '\n' + '* ``DuplicateChildFeature``: ' + QgsAttributeEditorRelation.Button.DuplicateChildFeature.__doc__ + '\n' + '* ``DeleteChildFeature``: ' + QgsAttributeEditorRelation.Button.DeleteChildFeature.__doc__ + '\n' + '* ``ZoomToChildFeature``: ' + QgsAttributeEditorRelation.Button.ZoomToChildFeature.__doc__ + '\n' + '* ``AllButtons``: ' + QgsAttributeEditorRelation.Button.AllButtons.__doc__
 # --
 QgsAttributeEditorRelation.Button.baseClass = QgsAttributeEditorRelation
-Button = QgsAttributeEditorRelation  # dirty hack since SIP seems to introduce the flags in module
 QgsAttributeEditorRelation.Buttons.baseClass = QgsAttributeEditorRelation
 Buttons = QgsAttributeEditorRelation  # dirty hack since SIP seems to introduce the flags in module
diff --git a/python/core/auto_generated/qgsattributeeditorelement.sip.in b/python/core/auto_generated/qgsattributeeditorelement.sip.in
@@ -298,9 +298,11 @@ This element will load a relation editor onto the form.
       ZoomToChildFeature,
       AllButtons
     };
+
     typedef QFlags<QgsAttributeEditorRelation::Button> Buttons;
 
 
+
  QgsAttributeEditorRelation( const QString &name, const QString &relationId, QgsAttributeEditorElement *parent );
 %Docstring
 

diff --git a/src/core/qgsattributeeditorelement.h b/src/core/qgsattributeeditorelement.h
@@ -351,9 +351,15 @@ class CORE_EXPORT QgsAttributeEditorRelation : public QgsAttributeEditorElement
       ZoomToChildFeature = 1 << 7, //!< Zoom to child feature
       AllButtons = Link | Unlink | SaveChildEdits | AddChildFeature | DuplicateChildFeature | DeleteChildFeature | ZoomToChildFeature //!< All buttons
     };
+
+    Q_ENUM( Button )
     Q_DECLARE_FLAGS( Buttons, Button )
-    Q_FLAG( Button )
+#if QT_VERSION >= QT_VERSION_CHECK( 5, 12, 0 )
     Q_FLAG( Buttons )
+#else
+    Q_ENUM( Buttons )
+#endif
+
 
     /**
      * \deprecated since QGIS 3.0.2. The name parameter is not used for anything and overwritten by the relationId internally.