Fix build issues

Author: NathanW2

src/app/qgslabelinggui.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);

src/gui/qgsexpressionbuilder.cpp

@@ -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 ");