From f17f1a5910987654f64bdf2209ea2a8ad96f7e1e Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Thu, 1 Aug 2019 14:56:32 +0200
Subject: add workaround for obsolete qt versions

This should fix CI.
---
 gui/init.cpp          |  2 ++
 gui/mapping-dialog.ui | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+)

(limited to 'gui')

diff --git a/gui/init.cpp b/gui/init.cpp
index 9821404d..3aae5772 100644
--- a/gui/init.cpp
+++ b/gui/init.cpp
@@ -263,7 +263,9 @@ int otr_main(int argc, char** argv, std::function<std::unique_ptr<QWidget>()> co
 #endif
 
     QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
     QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
+#endif
 
     QApplication app(argc, argv);
 
diff --git a/gui/mapping-dialog.ui b/gui/mapping-dialog.ui
index 0f0aa7c0..8d72533d 100644
--- a/gui/mapping-dialog.ui
+++ b/gui/mapping-dialog.ui
@@ -46,6 +46,12 @@
        <string>Yaw</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_2">
+       <property name="leftMargin">
+        <number>12</number>
+       </property>
+       <property name="rightMargin">
+        <number>12</number>
+       </property>
        <item>
         <widget class="QFrame" name="frame">
          <property name="sizePolicy">
@@ -120,6 +126,12 @@
        <string>Pitch</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_3">
+       <property name="leftMargin">
+        <number>12</number>
+       </property>
+       <property name="rightMargin">
+        <number>12</number>
+       </property>
        <item>
         <widget class="QFrame" name="frame_2">
          <property name="sizePolicy">
@@ -215,6 +227,12 @@
        <string>Roll</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_4">
+       <property name="leftMargin">
+        <number>12</number>
+       </property>
+       <property name="rightMargin">
+        <number>12</number>
+       </property>
        <item>
         <widget class="QFrame" name="frame_3">
          <property name="sizePolicy">
@@ -293,6 +311,12 @@
        <string>X</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_5">
+       <property name="leftMargin">
+        <number>12</number>
+       </property>
+       <property name="rightMargin">
+        <number>12</number>
+       </property>
        <item>
         <widget class="QFrame" name="frame444">
          <property name="sizePolicy">
@@ -367,6 +391,12 @@
        <string>Y</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_6">
+       <property name="leftMargin">
+        <number>12</number>
+       </property>
+       <property name="rightMargin">
+        <number>12</number>
+       </property>
        <item>
         <widget class="QFrame" name="frame555">
          <property name="sizePolicy">
@@ -441,6 +471,12 @@
        <string>Z</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_7">
+       <property name="leftMargin">
+        <number>12</number>
+       </property>
+       <property name="rightMargin">
+        <number>12</number>
+       </property>
        <item>
         <widget class="QFrame" name="frame666">
          <property name="sizePolicy">
-- 
cgit v1.2.3