summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-01-21 21:48:55 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-01-21 21:48:55 (GMT)
commit08e626b15a4b343e7bd335d3bb918dba1c15fa2c (patch)
treedd260e63cb3ee1240a0882236062103c9383e78d
parent739e16ab8fa21f22b8ddf827b0979e71bf613e78 (diff)
downloadswift-08e626b15a4b343e7bd335d3bb918dba1c15fa2c.zip
swift-08e626b15a4b343e7bd335d3bb918dba1c15fa2c.tar.bz2
Fix compilation on Qt < 4.7.
-rw-r--r--Swift/QtUI/QtJoinMUCWindow.cpp4
-rw-r--r--Swift/QtUI/QtJoinMUCWindow.ui9
2 files changed, 7 insertions, 6 deletions
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>