From 08e626b15a4b343e7bd335d3bb918dba1c15fa2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Fri, 21 Jan 2011 22:48:55 +0100
Subject: Fix compilation on Qt < 4.7.


diff --git a/Swift/QtUI/QtJoinMUCWindow.cpp b/Swift/QtUI/QtJoinMUCWindow.cpp
index 55b285b..7471c6f 100644
--- a/Swift/QtUI/QtJoinMUCWindow.cpp
+++ b/Swift/QtUI/QtJoinMUCWindow.cpp
@@ -11,9 +11,13 @@ namespace Swift {
 
 QtJoinMUCWindow::QtJoinMUCWindow() {
 	ui.setupUi(this);
+#if QT_VERSION >= 0x040700
+	ui.room->setPlaceholderText("swift@rooms.swift.im");
+#endif
 	connect(ui.room, SIGNAL(returnPressed()), this, SLOT(handleJoin()));
 	connect(ui.searchButton, SIGNAL(clicked()), this, SLOT(handleSearch()));
 	connect(ui.joinButton, SIGNAL(clicked()), this, SLOT(handleJoin()));
+	resize(200, 100);
 }
 
 void QtJoinMUCWindow::handleJoin() {
diff --git a/Swift/QtUI/QtJoinMUCWindow.ui b/Swift/QtUI/QtJoinMUCWindow.ui
index 2f3608a..6b718b3 100644
--- a/Swift/QtUI/QtJoinMUCWindow.ui
+++ b/Swift/QtUI/QtJoinMUCWindow.ui
@@ -6,12 +6,12 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>398</width>
-    <height>172</height>
+    <width>377</width>
+    <height>169</height>
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -51,9 +51,6 @@
        <property name="text">
         <string/>
        </property>
-       <property name="placeholderText">
-        <string>swift@rooms.swift.im</string>
-       </property>
       </widget>
      </item>
     </layout>
-- 
cgit v0.10.2-6-g49f6