Merge pull request #40755 from m-kuhn/non_virtual_qgsproperty

QgsProperty is not virtual
qgis · Dec 27, 2020 · 171911a6691fda9120e968fa5abe31010751a5c7 · 171911a
2 parents a92c882 + d33cb6d
commit 171911a6691fda9120e968fa5abe31010751a5c7
Unified Split

Showing with 2 additions and 2 deletions.

+1 −1 python/core/auto_generated/qgsproperty.sip.in

+1 −1 src/core/qgsproperty.h
diff --git a/python/core/auto_generated/qgsproperty.sip.in b/python/core/auto_generated/qgsproperty.sip.in
@@ -200,7 +200,7 @@ QgsProperty objects are implicitly shared and can be inexpensively copied.
 Constructor for a QgsProperty. The property will be set to an InvalidProperty type.
 %End
 
-    virtual ~QgsProperty();
+    ~QgsProperty();
 
     static QgsProperty fromExpression( const QString &expression, bool isActive = true );
 %Docstring

diff --git a/src/core/qgsproperty.h b/src/core/qgsproperty.h
@@ -246,7 +246,7 @@ class CORE_EXPORT QgsProperty
      */
     QgsProperty();
 
-    virtual ~QgsProperty();
+    ~QgsProperty();
 
     /**
      * Returns a new ExpressionBasedProperty created from the specified expression.