summaryrefslogtreecommitdiffhomepage
path: root/gui
diff options
context:
space:
mode:
Diffstat (limited to 'gui')
-rw-r--r--gui/correlation-calibrator.ui2
-rw-r--r--gui/process_detector.cpp4
2 files changed, 5 insertions, 1 deletions
diff --git a/gui/correlation-calibrator.ui b/gui/correlation-calibrator.ui
index d351d5da..02fdf1d2 100644
--- a/gui/correlation-calibrator.ui
+++ b/gui/correlation-calibrator.ui
@@ -40,7 +40,7 @@ Press "clear calibration" to remove any calibration data pertaining to
<enum>Qt::ScrollBarAlwaysOff</enum>
</property>
<property name="sizeAdjustPolicy">
- <enum>QAbstractScrollArea::AdjustToContentsOnFirstShow</enum>
+ <enum>QAbstractScrollArea::AdjustToContents</enum>
</property>
<property name="autoScroll">
<bool>true</bool>
diff --git a/gui/process_detector.cpp b/gui/process_detector.cpp
index 40737114..58ea4ca9 100644
--- a/gui/process_detector.cpp
+++ b/gui/process_detector.cpp
@@ -56,6 +56,10 @@ void proc_detector_settings::set_is_enabled(bool enabled)
});
}
+#ifdef __GNUG__
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
QHash<QString, QString> proc_detector_settings::split_process_names()
{
QString str = get_game_list();