Skip to content
Permalink
Browse files

Fix failing test + build warning

  • Loading branch information
nyalldawson committed Mar 1, 2017
1 parent 1f7635a commit e54cb2e80577aef6d776f7dfd9001a9c955fec84
Showing with 2 additions and 1 deletion.
  1. +1 −1 src/core/qgsexpression.cpp
  2. +1 −0 src/core/qgspropertycollection.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 );
@@ -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;

0 comments on commit e54cb2e

Please sign in to comment.
You can’t perform that action at this time.