From 7d5bb4294670a93bf4bdfe458e888a1e0fc7aee0 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Mon, 7 May 2012 00:19:22 +0200
Subject: [PATCH] Move back setPlaceholderText to code, from xml, as this broke
 building with Qt 4.6

---
 src/qt/forms/messagepage.ui    | 3 ---
 src/qt/forms/sendcoinsentry.ui | 6 ------
 src/qt/messagepage.cpp         | 5 +++++
 src/qt/sendcoinsentry.cpp      | 6 +++++-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/qt/forms/messagepage.ui b/src/qt/forms/messagepage.ui
index f2ae160c..512e47ad 100644
--- a/src/qt/forms/messagepage.ui
+++ b/src/qt/forms/messagepage.ui
@@ -104,9 +104,6 @@
      <property name="readOnly">
       <bool>true</bool>
      </property>
-     <property name="placeholderText">
-      <string>Click &quot;Sign Message&quot; to get signature</string>
-     </property>
     </widget>
    </item>
    <item>
diff --git a/src/qt/forms/sendcoinsentry.ui b/src/qt/forms/sendcoinsentry.ui
index da0273e9..22a3f8fd 100644
--- a/src/qt/forms/sendcoinsentry.ui
+++ b/src/qt/forms/sendcoinsentry.ui
@@ -65,9 +65,6 @@
        <property name="toolTip">
         <string>Enter a label for this address to add it to your address book</string>
        </property>
-       <property name="placeholderText">
-        <string>Enter a label for this address to add it to your address book</string>
-       </property>
       </widget>
      </item>
     </layout>
@@ -98,9 +95,6 @@
        <property name="maxLength">
         <number>34</number>
        </property>
-       <property name="placeholderText">
-        <string>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</string>
-       </property>
       </widget>
      </item>
      <item>
diff --git a/src/qt/messagepage.cpp b/src/qt/messagepage.cpp
index d658119a..57ad8292 100644
--- a/src/qt/messagepage.cpp
+++ b/src/qt/messagepage.cpp
@@ -24,6 +24,11 @@ MessagePage::MessagePage(QWidget *parent) :
     ui(new Ui::MessagePage)
 {
     ui->setupUi(this);
+    
+#if (QT_VERSION >= 0x040700)
+    /* Do not move this to the XML file, Qt before 4.7 will choke on it */
+    ui->signature->setPlaceholderText(tr("Click \"Sign Message\" to get signature"));
+#endif
 
     GUIUtil::setupAddressWidget(ui->signFrom, this);
 }
diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp
index d9b1daf6..5960597c 100644
--- a/src/qt/sendcoinsentry.cpp
+++ b/src/qt/sendcoinsentry.cpp
@@ -20,7 +20,11 @@ SendCoinsEntry::SendCoinsEntry(QWidget *parent) :
 #ifdef Q_WS_MAC
     ui->payToLayout->setSpacing(4);
 #endif
-
+#if QT_VERSION >= 0x040700
+    /* Do not move this to the XML file, Qt before 4.7 will choke on it */
+    ui->addAsLabel->setPlaceholderText(tr("Enter a label for this address to add it to your address book"));
+    ui->payTo->setPlaceholderText(tr("Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)"));
+#endif
     setFocusPolicy(Qt::TabFocus);
     setFocusProxy(ui->payTo);