fix build with Qt <4.7 (eg. Debian Lucid)

qgis · Oct 9, 2013 · f49ea36 · f49ea36
1 parent 15efd23
commit f49ea36
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/gui/qgsrelationadddlg.cpp b/src/gui/qgsrelationadddlg.cpp
@@ -5,6 +5,12 @@ QgsRelationAddDlg::QgsRelationAddDlg( QWidget *parent ) :
     QDialog( parent )
 {
   setupUi( this );
+
+#if QT_VERSION >= 0x40700
+  mTxtRelationId->setPlaceholderText( tr( "[Generated automatically]" ) );
+#else
+  mTxtRelationId->setToolTip( tr( "[Generated automatically]" ) );
+#endif
 }
 
 void QgsRelationAddDlg::addLayers( QList< QgsVectorLayer* > layers )

diff --git a/src/ui/qgsrelationadddlgbase.ui b/src/ui/qgsrelationadddlgbase.ui
@@ -80,9 +80,6 @@
    </item>
    <item row="8" column="1">
     <widget class="QLineEdit" name="mTxtRelationId">
-     <property name="placeholderText">
-      <string>[Generated automatically]</string>
-     </property>
     </widget>
    </item>
    <item row="1" column="1">