From c01678a3fa328e2f7b8f33bfe54733820802f7b7 Mon Sep 17 00:00:00 2001
From: Jan Dalheimer <jan@dalheimer.de>
Date: Mon, 30 Dec 2013 14:05:53 +0100
Subject: Don't use stuff that's new in 5.2 if we don't compile with that

---
 gui/dialogs/SettingsDialog.cpp | 4 ++++
 gui/dialogs/SettingsDialog.ui  | 6 +-----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'gui')

diff --git a/gui/dialogs/SettingsDialog.cpp b/gui/dialogs/SettingsDialog.cpp
index 1ca0007c..2797fe4e 100644
--- a/gui/dialogs/SettingsDialog.cpp
+++ b/gui/dialogs/SettingsDialog.cpp
@@ -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->sortLastLaunchedBtn, Sort_LastLaunch);
 
+#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)
+	ui->jsonEditorTextBox->setClearButtonEnabled(true);
+#endif
+
 	loadSettings(MMC->settings().get());
 	updateCheckboxStuff();
 }
diff --git a/gui/dialogs/SettingsDialog.ui b/gui/dialogs/SettingsDialog.ui
index ca8c7391..4c05b883 100644
--- a/gui/dialogs/SettingsDialog.ui
+++ b/gui/dialogs/SettingsDialog.ui
@@ -243,11 +243,7 @@
          </property>
          <layout class="QGridLayout" name="foldersBoxLayout_2">
           <item row="0" column="1">
-           <widget class="QLineEdit" name="jsonEditorTextBox">
-            <property name="clearButtonEnabled">
-             <bool>true</bool>
-            </property>
-           </widget>
+           <widget class="QLineEdit" name="jsonEditorTextBox"/>
           </item>
           <item row="0" column="0">
            <widget class="QLabel" name="labelJsonEditor">
-- 
cgit v1.2.3