From 28b74204be6f9a63f26344570e25956a2ae7f3ff Mon Sep 17 00:00:00 2001
From: Serhii Hadzhilov <serhii-external@symless.com>
Date: Fri, 21 May 2021 10:12:36 +0300
Subject: [PATCH] SYNERGY-661 Fix Ubuntu 16.04 pipeline in Azure

---
 CI/Linux/linux-build.yml | 8 ++++----
 azure-pipelines.yml      | 1 +
 src/gui/src/main.cpp     | 4 ++++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CI/Linux/linux-build.yml b/CI/Linux/linux-build.yml
index d7b5ca661..917c5fe38 100644
--- a/CI/Linux/linux-build.yml
+++ b/CI/Linux/linux-build.yml
@@ -8,7 +8,7 @@ steps:
       cd build-release
       if [ -z $(which cmake) ]; then cmake3 -DCMAKE_BUILD_TYPE=Release ..; else cmake -DCMAKE_BUILD_TYPE=Release ..; fi
       . ./version
-      make -j
+      make -j$(makeJobsLimit)
     condition: eq(variables['packager'],'deb')
     displayName: 'Build Release deb'
     env:
@@ -22,7 +22,7 @@ steps:
       else cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH=$(pwd)/rpm/BUILDROOT/usr ..;
       fi
       . ./version
-      make -j
+      make -j$(makeJobsLimit)
     condition: eq(variables['packager'],'rpm')
     displayName: 'Build Release rpm'
     env:
@@ -34,7 +34,7 @@ steps:
       export SYNERGY_ENTERPRISE=1
       if [ -z $(which cmake) ]; then cmake3 -DCMAKE_BUILD_TYPE=Release -DSYNERGY_ENTERPRISE=ON ..; else cmake -DCMAKE_BUILD_TYPE=Release -DSYNERGY_ENTERPRISE=ON ..; fi
       . ./version
-      make -j
+      make -j$(makeJobsLimit)
     displayName: 'Build enterprise'
     condition: eq(variables['packager'],'deb')
     env:
@@ -48,7 +48,7 @@ steps:
       else cmake -DCMAKE_BUILD_TYPE=Release -DSYNERGY_ENTERPRISE=ON -DCMAKE_INSTALL_PREFIX:PATH=$(pwd)/rpm/BUILDROOT/usr ..;
       fi
       . ./version
-      make -j
+      make -j$(makeJobsLimit)
     condition: eq(variables['packager'],'rpm')
     displayName: 'Build enterprise rpm'
     env:
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index e3754e98a..b4129eb9f 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -14,6 +14,7 @@ jobs:
           image: symless/synergy-core:ubuntu16.04
           packager: deb
           name: ubuntu16
+          makeJobsLimit: 1
         ubuntu1804:
           image: symless/synergy-core:ubuntu18.04
           packager: deb
diff --git a/src/gui/src/main.cpp b/src/gui/src/main.cpp
index 6d1ac22e3..d2ab11aff 100644
--- a/src/gui/src/main.cpp
+++ b/src/gui/src/main.cpp
@@ -56,7 +56,11 @@ int main(int argc, char* argv[])
     /* Workaround for QTBUG-40332 - "High ping when QNetworkAccessManager is instantiated" */
     ::setenv ("QT_BEARER_POLL_TIMEOUT", "-1", 1);
 #endif
+
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
     QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+#endif
+
     QCoreApplication::setOrganizationName("Synergy");
     QCoreApplication::setOrganizationDomain("http://symless.com/");
     QCoreApplication::setApplicationName("Synergy");