Merge remote-tracking branch 'edigonzales/master'

Conflicts: src/core/symbology-ng/qgslinesymbollayerv2.cpp
qgis · Jun 15, 2014 · 595f4ef · 595f4ef
2 parents 685d3e8 + 703c3e7
commit 595f4ef
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/core/symbology-ng/qgslinesymbollayerv2.cpp b/src/core/symbology-ng/qgslinesymbollayerv2.cpp
@@ -447,6 +447,13 @@ void QgsSimpleLineSymbolLayerV2::applyDataDefinedSymbology( QgsSymbolV2RenderCon
     double scaledWidth = mWidth * QgsSymbolLayerV2Utils::lineWidthScaleFactor( context.renderContext(), mWidthUnit, mWidthMapUnitScale );
 
     double dashWidthDiv = mPen.widthF();
+
+    if ( strokeWidthExpression )
+    {
+      dashWidthDiv = pen.widthF();
+      scaledWidth = pen.widthF();
+    }
+
     //fix dash pattern width in Qt 4.8
     QStringList versionSplit = QString( qVersion() ).split( "." );
     if ( versionSplit.size() > 1
@@ -455,8 +462,7 @@ void QgsSimpleLineSymbolLayerV2::applyDataDefinedSymbology( QgsSymbolV2RenderCon
     {
       dashWidthDiv = 1.0;
     }
-
-
+
     QVector<qreal> dashVector;
     QStringList dashList = dashPatternExpression->evaluate( const_cast<QgsFeature*>( context.feature() ) ).toString().split( ";" );
     QStringList::const_iterator dashIt = dashList.constBegin();