Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-27 16:39:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #65 from AsamK/fix_qt46

Browse Source 
Fix compile with qt < 4.7
This commit is contained in:
Cyril Soler 2015-08-31 19:50:12 -04:00
commit 4006b08093
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
retroshare-gui/src/gui/chat/CreateLobbyDialog.cpp
View File

@ -47,11 +47,10 @@ CreateLobbyDialog::CreateLobbyDialog(const std::set<RsPeerId>& peer_list, int pr
ui->idChooser_CB->loadIds(IDCHOOSER_ID_REQUIRED, default_identity); ui->idChooser_CB->loadIds(IDCHOOSER_ID_REQUIRED, default_identity);
//#if QT_VERSION >= 0x040700 #if QT_VERSION >= 0x040700
// ui->lobbyName_LE->setPlaceholderText(tr("Put a sensible lobby name here")) ; ui->lobbyName_LE->setPlaceholderText(tr("Put a sensible lobby name here"));
// ui->nickName_LE->setPlaceholderText(tr("Your nickname for this lobby (Change default name in options->chat)")) ; ui->lobbyTopic_LE->setPlaceholderText(tr("Set a descriptive topic here"));
//#endif #endif
// ui->nickName_LE->setText(QString::fromUtf8(default_nick.c_str())) ;
connect( ui->buttonBox, SIGNAL(accepted()), this, SLOT(createLobby())); connect( ui->buttonBox, SIGNAL(accepted()), this, SLOT(createLobby()));
connect( ui->buttonBox, SIGNAL(rejected()), this, SLOT(close())); connect( ui->buttonBox, SIGNAL(rejected()), this, SLOT(close()));

6
retroshare-gui/src/gui/chat/CreateLobbyDialog.ui
View File

@ -71,11 +71,7 @@
</widget> </widget>
</item> </item>
<item row="1" column="2"> <item row="1" column="2">
<widget class="QLineEdit" name="lobbyTopic_LE"> <widget class="QLineEdit" name="lobbyTopic_LE"/>
<property name="placeholderText">
<string>Set a descriptive topic here</string>
</property>
</widget>
</item> </item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="label_4">