Skip to content

Commit efb54ea

Browse files
committed
fix nightly builds for Qt <4.7
1 parent ff87dee commit efb54ea

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

src/gui/qgsexpressionbuilderwidget.cpp

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,11 @@ QgsExpressionBuilderWidget::QgsExpressionBuilderWidget( QWidget *parent )
8787
if ( func.mParams >= 1 )
8888
name += "(";
8989
registerItem( func.mGroup, func.mName, " " + name + " " );
90-
};
90+
}
91+
92+
#if QT_VERSION >= 0x040700
93+
txtSearchEdit->setPlaceHolderText( tr( "Search" ) );
94+
#endif
9195
}
9296

9397

@@ -114,9 +118,9 @@ void QgsExpressionBuilderWidget::currentChanged( const QModelIndex &index, const
114118
mValueListWidget->clear();
115119
}
116120

117-
btnLoadAll->setVisible(item->getItemType() == QgsExpressionItem::Field);
118-
btnLoadSample->setVisible(item->getItemType() == QgsExpressionItem::Field);
119-
mValueGroupBox->setVisible(item->getItemType() == QgsExpressionItem::Field);
121+
btnLoadAll->setVisible( item->getItemType() == QgsExpressionItem::Field );
122+
btnLoadSample->setVisible( item->getItemType() == QgsExpressionItem::Field );
123+
mValueGroupBox->setVisible( item->getItemType() == QgsExpressionItem::Field );
120124

121125
// Show the help for the current item.
122126
QString help = loadFunctionHelp( item );

src/ui/qgsexpressionbuilder.ui

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,6 @@
7979
<property name="enabled">
8080
<bool>true</bool>
8181
</property>
82-
<property name="placeholderText">
83-
<string>Search</string>
84-
</property>
8582
</widget>
8683
</item>
8784
</layout>

0 commit comments

Comments
 (0)