Skip to content

Commit 4ffa820

Browse files
committed
Fix build issues
1 parent 24ff1cc commit 4ffa820

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/app/qgslabelinggui.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ void QgsLabelingGui::showExpressionDialog()
488488
QDialog* dlg = new QDialog();
489489
QDialogButtonBox* buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok
490490
| QDialogButtonBox::Cancel);
491-
QGridLayout* *layout = new QGridLayout();
491+
QGridLayout* layout = new QGridLayout();
492492
QgsExpressionBuilderWidget* builder = new QgsExpressionBuilderWidget(mLayer);
493493
dlg->setLayout(layout);
494494
layout->addWidget(builder);

src/gui/qgsexpressionbuilder.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ QgsExpressionBuilderWidget::QgsExpressionBuilderWidget(QgsVectorLayer *layer)
3232
this->registerItem("Operators","/"," / ");
3333
this->registerItem("Operators","^"," ^ ");
3434
this->registerItem("Operators","="," = ");
35-
this->registerItem("Operators","||"," || ","<b>|| (String Concatenation)</b> "/
36-
"<br> Joins two values together into a string " /
35+
this->registerItem("Operators","||"," || ","<b>|| (String Concatenation)</b> "\
36+
"<br> Joins two values together into a string " \
3737
"<br> <i>Usage:</i><br>'Dia' || Diameter");
3838

39-
this->registerItem("Geometry","Area"," $area ","<b>$area</b> <br> Returns the area the object." /
39+
this->registerItem("Geometry","Area"," $area ","<b>$area</b> <br> Returns the area the object." \
4040
"<br> Only applies to polygons.");
4141
this->registerItem("Geometry","Length"," $length ","<b>$length</b> <br> Returns the length the object. <br> Only applies to polylines.");
4242
this->registerItem("Geometry","Perimeter"," $perimeter ");

0 commit comments

Comments
 (0)