Show all layer fields in labeling dialog

git-svn-id: http://svn.osgeo.org/qgis/trunk@15181 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Feb 17, 2011 · 5b23cf6 · 5b23cf6
1 parent d373bb6
commit 5b23cf6
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/app/qgslabelinggui.cpp b/src/app/qgslabelinggui.cpp
@@ -303,8 +303,9 @@ QgsPalLayerSettings QgsLabelingGui::layerSettings()
 
 void QgsLabelingGui::populateFieldNames()
 {
-  QgsFieldMap fields = mLayer->dataProvider()->fields();
-  for ( QgsFieldMap::iterator it = fields.begin(); it != fields.end(); it++ )
+  const QgsFieldMap& fields = mLayer->pendingFields();
+  QgsFieldMap::const_iterator it = fields.constBegin();
+  for ( ; it != fields.constEnd(); it++ )
   {
     cboFieldName->addItem( it->name() );
   }