Merge branch 'master' of github.com:qgis/Quantum-GIS

qgis · Jun 14, 2012 · f9ff8cc · f9ff8cc
2 parents adca9d3 + efb54ea
commit f9ff8cc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/gui/qgsexpressionbuilderwidget.cpp b/src/gui/qgsexpressionbuilderwidget.cpp
@@ -87,7 +87,11 @@ QgsExpressionBuilderWidget::QgsExpressionBuilderWidget( QWidget *parent )
     if ( func.mParams >= 1 )
       name += "(";
     registerItem( func.mGroup, func.mName, " " + name + " " );
-  };
+  }
+
+#if QT_VERSION >= 0x040700
+  txtSearchEdit->setPlaceHolderText( tr( "Search" ) );
+#endif
 }
 
 
@@ -114,9 +118,9 @@ void QgsExpressionBuilderWidget::currentChanged( const QModelIndex &index, const
     mValueListWidget->clear();
   }
 
-  btnLoadAll->setVisible(item->getItemType() == QgsExpressionItem::Field);
-  btnLoadSample->setVisible(item->getItemType() == QgsExpressionItem::Field);
-  mValueGroupBox->setVisible(item->getItemType() == QgsExpressionItem::Field);
+  btnLoadAll->setVisible( item->getItemType() == QgsExpressionItem::Field );
+  btnLoadSample->setVisible( item->getItemType() == QgsExpressionItem::Field );
+  mValueGroupBox->setVisible( item->getItemType() == QgsExpressionItem::Field );
 
   // Show the help for the current item.
   QString help = loadFunctionHelp( item );

diff --git a/src/ui/qgsexpressionbuilder.ui b/src/ui/qgsexpressionbuilder.ui
@@ -79,9 +79,6 @@
           <property name="enabled">
            <bool>true</bool>
           </property>
-          <property name="placeholderText">
-           <string>Search</string>
-          </property>
          </widget>
         </item>
        </layout>