From 2f79d2f04c0391c8321e4ef5a7c608ef8e0551f8 Mon Sep 17 00:00:00 2001
From: mantelt <thomas.mantel@mavt.ethz.ch>
Date: Wed, 7 Mar 2018 11:11:51 +0100
Subject: [PATCH] Allow setting MAVLINK relative path, absolut path and dialect
 in user_config.pri

---
 QGCExternalLibs.pri | 24 +++++++++++++++++++++---
 qgroundcontrol.pro  |  5 -----
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/QGCExternalLibs.pri b/QGCExternalLibs.pri
index 506884f6f..fa73a0bb4 100644
--- a/QGCExternalLibs.pri
+++ b/QGCExternalLibs.pri
@@ -21,14 +21,32 @@ WindowsBuild {
 # In the mean time, it’s possible to define a completely different dialect by defining the
 # location and name below.
 
+# check for user defined settings in user_config.pri if not already set as qmake argument
 isEmpty(MAVLINKPATH_REL) {
-    MAVLINKPATH_REL = libs/mavlink/include/mavlink/v2.0
+    exists(user_config.pri):infile(user_config.pri, MAVLINKPATH_REL) {
+        MAVLINKPATH_REL = $$fromfile(user_config.pri, MAVLINKPATH_REL)
+        message($$sprintf("Using user-supplied relativ mavlink path '%1' specified in user_config.pri", $$MAVLINKPATH_REL))
+    } else {
+        MAVLINKPATH_REL = libs/mavlink/include/mavlink/v2.0
+    }
 }
+
 isEmpty(MAVLINKPATH) {
-    MAVLINKPATH     = $$BASEDIR/$$MAVLINKPATH_REL
+    exists(user_config.pri):infile(user_config.pri, MAVLINKPATH) {
+        MAVLINKPATH     = $$fromfile(user_config.pri, MAVLINKPATH)
+        message($$sprintf("Using user-supplied mavlink path '%1' specified in user_config.pri", $$MAVLINKPATH))
+    } else {
+        MAVLINKPATH     = $$BASEDIR/$$MAVLINKPATH_REL
+    }
 }
+
 isEmpty(MAVLINK_CONF) {
-    MAVLINK_CONF    = ardupilotmega
+    exists(user_config.pri):infile(user_config.pri, MAVLINK_CONF) {
+        MAVLINK_CONF = $$fromfile(user_config.pri, MAVLINK_CONF)
+        message($$sprintf("Using user-supplied mavlink dialect '%1' specified in user_config.pri", $$MAVLINK_CONF))
+    } else {
+        MAVLINK_CONF = ardupilotmega
+    }
 }
 
 # If defined, all APM specific MAVLink messages are disabled
diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index f84855716..cb0226f85 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -97,11 +97,6 @@ exists(user_config.pri):infile(user_config.pri, CONFIG) {
     message($$sprintf("Using user-supplied additional config: '%1' specified in user_config.pri", $$fromfile(user_config.pri, CONFIG)))
 }
 
-exists(user_config.pri):infile(user_config.pri, MAVLINK_CONF) {
-    MAVLINK_CONF = $$fromfile(user_config.pri, MAVLINK_CONF)
-    message($$sprintf("Using user-supplied mavlink dialect: '%1' specified in user_config.pri", $$fromfile(user_config.pri, MAVLINK_CONF)))
-}
-
 #
 # Custom Build
 #
-- 
2.22.0