Skip to content

Commit

Permalink
Fix failing test + build warning
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Mar 1, 2017
1 parent 1f7635a commit e54cb2e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/core/qgsexpression.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down
1 change: 1 addition & 0 deletions src/core/qgspropertycollection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit e54cb2e

Please sign in to comment.