Merge branch 'expression-labels' of github.com:NathanW2/Quantum-GIS i…

…nto expression-labels
qgis · Oct 15, 2011 · 0359e5b · 0359e5b
2 parents 4e6f83b + 0d187bf
commit 0359e5b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/app/qgslabelinggui.cpp b/src/app/qgslabelinggui.cpp
@@ -82,7 +82,7 @@ QgsLabelingGui::QgsLabelingGui( QgsPalLabeling* lbl, QgsVectorLayer* layer, QgsM
   btnExpression->setEnabled( lyr.enabled );
 
   //Add the current expression to the bottom of the list.
-  if (lyr.isExpression and !lyr.fieldName.isEmpty())
+  if (lyr.isExpression && !lyr.fieldName.isEmpty())
       cboFieldName->addItem(lyr.fieldName);
 
   // placement