0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't use stuff that's new in 5.2 if we don't compile with that

Browse Source
This commit is contained in:
Jan Dalheimer 2013-12-30 14:05:53 +01:00
parent 5a7fc1e123
commit c01678a3fa
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gui/dialogs/SettingsDialog.cpp
View File

@ -40,6 +40,10 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent), ui(new Ui::Se
ui->sortingModeGroup->setId(ui->sortByNameBtn, Sort_Name); ui->sortingModeGroup->setId(ui->sortByNameBtn, Sort_Name);
ui->sortingModeGroup->setId(ui->sortLastLaunchedBtn, Sort_LastLaunch); ui->sortingModeGroup->setId(ui->sortLastLaunchedBtn, Sort_LastLaunch);
#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)
ui->jsonEditorTextBox->setClearButtonEnabled(true);
#endif
loadSettings(MMC->settings().get()); loadSettings(MMC->settings().get());
updateCheckboxStuff(); updateCheckboxStuff();
} }

6
gui/dialogs/SettingsDialog.ui
View File

@ -243,11 +243,7 @@
</property> </property>
<layout class="QGridLayout" name="foldersBoxLayout_2"> <layout class="QGridLayout" name="foldersBoxLayout_2">
<item row="0" column="1"> <item row="0" column="1">
<widget class="QLineEdit" name="jsonEditorTextBox"> <widget class="QLineEdit" name="jsonEditorTextBox"/>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget>
</item> </item>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="labelJsonEditor"> <widget class="QLabel" name="labelJsonEditor">