Skip to content

Commit 5b23cf6

Browse files
author
mhugent
committed
Show all layer fields in labeling dialog
git-svn-id: http://svn.osgeo.org/qgis/trunk@15181 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent d373bb6 commit 5b23cf6

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/app/qgslabelinggui.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,8 +303,9 @@ QgsPalLayerSettings QgsLabelingGui::layerSettings()
303303

304304
void QgsLabelingGui::populateFieldNames()
305305
{
306-
QgsFieldMap fields = mLayer->dataProvider()->fields();
307-
for ( QgsFieldMap::iterator it = fields.begin(); it != fields.end(); it++ )
306+
const QgsFieldMap& fields = mLayer->pendingFields();
307+
QgsFieldMap::const_iterator it = fields.constBegin();
308+
for ( ; it != fields.constEnd(); it++ )
308309
{
309310
cboFieldName->addItem( it->name() );
310311
}

0 commit comments

Comments
 (0)