Skip to content
Permalink
Browse files
Fix build issues
  • Loading branch information
NathanW2 committed Aug 10, 2011
1 parent 24ff1cc commit 4ffa8208d7632bfb7eade500f9261f0f9d25b151
Showing with 4 additions and 4 deletions.
  1. +1 −1 src/app/qgslabelinggui.cpp
  2. +3 −3 src/gui/qgsexpressionbuilder.cpp
@@ -488,7 +488,7 @@ void QgsLabelingGui::showExpressionDialog()
QDialog* dlg = new QDialog();
QDialogButtonBox* buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok
| QDialogButtonBox::Cancel);
QGridLayout* *layout = new QGridLayout();
QGridLayout* layout = new QGridLayout();
QgsExpressionBuilderWidget* builder = new QgsExpressionBuilderWidget(mLayer);
dlg->setLayout(layout);
layout->addWidget(builder);
@@ -32,11 +32,11 @@ QgsExpressionBuilderWidget::QgsExpressionBuilderWidget(QgsVectorLayer *layer)
this->registerItem("Operators","/"," / ");
this->registerItem("Operators","^"," ^ ");
this->registerItem("Operators","="," = ");
this->registerItem("Operators","||"," || ","<b>|| (String Concatenation)</b> "/
"<br> Joins two values together into a string " /
this->registerItem("Operators","||"," || ","<b>|| (String Concatenation)</b> "\
"<br> Joins two values together into a string " \
"<br> <i>Usage:</i><br>'Dia' || Diameter");

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

0 comments on commit 4ffa820

Please sign in to comment.