File tree 1 file changed +2
-2
lines changed
1 file changed +2
-2
lines changed Original file line number Diff line number Diff line change @@ -274,7 +274,7 @@ void QgsMergeAttributesDialog::refreshMergedValue( int col )
274
274
}
275
275
else // an existing feature value
276
276
{
277
- int featureId = mergeBehaviourString.split ( " " ).at ( 1 ).toInt (); // probably not very robust for translations...
277
+ int featureId = mergeBehaviourString.split ( " " ).value ( 1 ).toInt (); // probably not very robust for translations...
278
278
mergeResult = featureAttribute ( featureId, col );
279
279
}
280
280
@@ -488,7 +488,7 @@ void QgsMergeAttributesDialog::on_mFromSelectedPushButton_clicked()
488
488
QComboBox* currentComboBox = qobject_cast<QComboBox *>( mTableWidget ->cellWidget ( 0 , i ) );
489
489
if ( currentComboBox )
490
490
{
491
- currentComboBox->setCurrentIndex ( currentComboBox->findText ( tr ( " feature %1" ).arg ( featureId ) ) );
491
+ currentComboBox->setCurrentIndex ( currentComboBox->findText ( tr ( " Feature %1" ).arg ( featureId ) ) );
492
492
}
493
493
}
494
494
}
You can’t perform that action at this time.
0 commit comments