From e4da16b9d65516e1d80539ef282300cb507cd08b Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Tue, 31 Jul 2012 10:43:38 +0200
Subject: [PATCH] support Qt 4.6

---
 src/mirall/proxydialog.cpp | 6 ++++++
 src/mirall/proxydialog.ui  | 8 +-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/mirall/proxydialog.cpp b/src/mirall/proxydialog.cpp
index a025008f79..974cc162ac 100644
--- a/src/mirall/proxydialog.cpp
+++ b/src/mirall/proxydialog.cpp
@@ -23,6 +23,12 @@ Mirall::ProxyDialog::ProxyDialog( QWidget* parent )
     : QDialog(parent)
 {
     setupUi(this);
+
+#if QT_VERSION >= 0x040700
+    hostLineEdit->setPlaceholderText(QApplication::translate("proxyDialog", "Hostname of proxy server"));
+    userLineEdit->setPlaceholderText(QApplication::translate("proxyDialog", "Username to authenticate on proxy server"));
+#endif
+
 }
 
 void Mirall::ProxyDialog::saveSettings()
diff --git a/src/mirall/proxydialog.ui b/src/mirall/proxydialog.ui
index 90ff07fe56..55d363daba 100644
--- a/src/mirall/proxydialog.ui
+++ b/src/mirall/proxydialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>509</width>
-    <height>299</height>
+    <height>360</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -116,9 +116,6 @@
                  <property name="text">
                   <string/>
                  </property>
-                 <property name="placeholderText">
-                  <string>Username to authenticate on proxy server</string>
-                 </property>
                 </widget>
                </item>
                <item row="4" column="0">
@@ -166,9 +163,6 @@
                  <property name="text">
                   <string/>
                  </property>
-                 <property name="placeholderText">
-                  <string>Hostname of proxy server</string>
-                 </property>
                 </widget>
                </item>
                <item row="1" column="1">