[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-i18n-doc
Subject:    =?utf-8?q?=5Bmarble=5D_src/lib=3A_Fix_compilation_with_Qt_=3C_4?=
From:       Dennis_Nienhüser <earthwings () gentoo ! org>
Date:       2011-05-21 12:36:20
Message-ID: 20110521123620.BB3ABA60A4 () git ! kde ! org
[Download RAW message or body]

Git commit 1cb0bfb37718f281db31f055fb41dbda56cea3fe by Dennis Nienhüser.
Committed on 21/05/2011 at 14:32.
Pushed by nienhueser into branch 'master'.

Fix compilation with Qt < 4.7.

The placeholderText property was introduced in Qt 4.7 and uic does
not generate code compatible with older Qt versions.
CCMAIL:kde-i18n-doc@kde.org
@translators: The string is not new, but it might move from marble.po
to marble_qt.po by the patch. Sorry for that.

M  +4    -0    src/lib/GoToDialog.cpp     
M  +1    -5    src/lib/GoToDialog.ui     

http://commits.kde.org/marble/1cb0bfb37718f281db31f055fb41dbda56cea3fe

diff --git a/src/lib/GoToDialog.cpp b/src/lib/GoToDialog.cpp
index 0e62359..e52ffdd 100644
--- a/src/lib/GoToDialog.cpp
+++ b/src/lib/GoToDialog.cpp
@@ -350,6 +350,10 @@ GoToDialog::GoToDialog( MarbleWidget* marbleWidget, QWidget * parent, Qt::Window
 #endif // Q_WS_MAEMO_5
     setupUi( this );
 
+#if QT_VERSION >= 0x40700
+    searchLineEdit->setPlaceholderText( tr( "Address or search term" ) );
+#endif
+
     d->m_targetModel = new TargetModel( marbleWidget, this );
     bookmarkListView->setModel( d->m_targetModel );
     connect( bookmarkListView, SIGNAL( activated( QModelIndex ) ),
diff --git a/src/lib/GoToDialog.ui b/src/lib/GoToDialog.ui
index 3c6e53a..7e7742a 100644
--- a/src/lib/GoToDialog.ui
+++ b/src/lib/GoToDialog.ui
@@ -17,11 +17,7 @@
    <item row="0" column="0">
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
-      <widget class="QLineEdit" name="searchLineEdit">
-       <property name="placeholderText">
-        <string>Address or search term</string>
-       </property>
-      </widget>
+      <widget class="QLineEdit" name="searchLineEdit"/>
      </item>
      <item>
       <widget class="QPushButton" name="progress">

[prev in list] [next in list] [prev in thread] [next in thread]