Fix failing test + build warning

qgis · Mar 1, 2017 · e54cb2e · e54cb2e
1 parent 1f7635a
commit e54cb2e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/core/qgsexpression.cpp b/src/core/qgsexpression.cpp
@@ -3723,7 +3723,7 @@ static QVariant fcnMapAVals( const QVariantList& values, const QgsExpressionCont
   return getMapValue( values.at( 0 ), parent ).values();
 }
 
-static QVariant fcnEnvVar( const QVariantList& values, const QgsExpressionContext*, QgsExpression* parent )
+static QVariant fcnEnvVar( const QVariantList& values, const QgsExpressionContext*, QgsExpression* )
 {
   QString envVarName = values.at( 0 ).toString();
   return QProcessEnvironment::systemEnvironment().value( envVarName );

diff --git a/src/core/qgspropertycollection.cpp b/src/core/qgspropertycollection.cpp
@@ -109,6 +109,7 @@ QgsPropertyCollection::QgsPropertyCollection( const QgsPropertyCollection& other
 
 QgsPropertyCollection&QgsPropertyCollection::operator=( const QgsPropertyCollection & other )
 {
+  QgsAbstractPropertyCollection::operator=( other );
   mProperties = other.mProperties;
   mProperties.detach();
   mDirty = other.mDirty;