Skip to content
Permalink
Browse files

Fix Travis build, take 2

  • Loading branch information
nyalldawson committed Jul 2, 2016
1 parent 8af7265 commit 7ce8cade8e4cc2dc59be10da837141c3459c30cb
Showing with 4 additions and 4 deletions.
  1. +1 −1 python/core/symbology-ng/qgspointdisplacementrenderer.sip
  2. +3 −3 src/core/qgsvectorlayer.cpp
@@ -69,7 +69,7 @@ class QgsPointDisplacementRenderer : QgsFeatureRendererV2
QString labelAttributeName() const;

void setEmbeddedRenderer( QgsFeatureRendererV2* r /Transfer/ );
QgsFeatureRendererV2* embeddedRenderer();
const QgsFeatureRendererV2* embeddedRenderer() const;

virtual void setLegendSymbolItem( const QString& key, QgsSymbolV2* symbol );

@@ -2985,7 +2985,7 @@ void QgsVectorLayer::uniqueValues( int index, QList<QVariant> &uniqueValues, int
mDataProvider->uniqueValues( index, uniqueValues, limit );
return;
}

FALLTHROUGH;
//we need to go through each feature
case QgsFields::OriginJoin:
case QgsFields::OriginExpression:
@@ -3046,7 +3046,7 @@ QVariant QgsVectorLayer::minimumValue( int index )
return mDataProvider->minimumValue( index );
}
}

FALLTHROUGH;
// no choice but to go through all features
case QgsFields::OriginExpression:
case QgsFields::OriginJoin:
@@ -3104,7 +3104,7 @@ QVariant QgsVectorLayer::maximumValue( int index )
return mDataProvider->maximumValue( index );
}


FALLTHROUGH;
//no choice but to go through each feature
case QgsFields::OriginJoin:
case QgsFields::OriginExpression:

0 comments on commit 7ce8cad

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