From 1e662d61753e472b673b00031b07f55d0523dcc1 Mon Sep 17 00:00:00 2001
From: LibrePilot Packager <packaging@librepilot.org>
Date: Sat, 11 Jul 2015 22:45:20 +0100
Subject: [PATCH] removed openpilotgcs hardcoding from qt.conf

---
 ground/openpilotgcs/src/app/app.pro                    |  7 ++++++-
 ground/openpilotgcs/src/app/qt.conf                    |  2 --
 .../openpilotgcs/src/app/{qtconf.qrc => qtconf.qrc.in} | 10 +++++-----
 3 files changed, 11 insertions(+), 8 deletions(-)
 delete mode 100644 ground/openpilotgcs/src/app/qt.conf
 rename ground/openpilotgcs/src/app/{qtconf.qrc => qtconf.qrc.in} (95%)

diff --git a/ground/openpilotgcs/src/app/app.pro b/ground/openpilotgcs/src/app/app.pro
index 5293f1ed5..6dc6d350f 100644
--- a/ground/openpilotgcs/src/app/app.pro
+++ b/ground/openpilotgcs/src/app/app.pro
@@ -43,7 +43,12 @@ win32 {
     include(../rpath.pri)
 
     equals(copyqt, 1) {
-        RESOURCES += qtconf.qrc
+        RESOURCES += $$OUT_PWD/qtconf.qrc
+
+        # Copy qtconf.qrc to OUT_PWD because paths are relative
+        # This needs to be done at qmake time because the Makefile depends on it
+        system(cp $$PWD/qtconf.qrc.in $$OUT_PWD/qtconf.qrc)
+        system(printf $$shell_quote([Paths]\nPrefix = $$relative_path($$GCS_QT_BASEPATH, $$GCS_APP_PATH)\n) > $$OUT_PWD/qt.conf)
     }
 }
 
diff --git a/ground/openpilotgcs/src/app/qt.conf b/ground/openpilotgcs/src/app/qt.conf
deleted file mode 100644
index f83499f3f..000000000
--- a/ground/openpilotgcs/src/app/qt.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[Paths]
-Prefix = ../lib/openpilotgcs/qt5/
diff --git a/ground/openpilotgcs/src/app/qtconf.qrc b/ground/openpilotgcs/src/app/qtconf.qrc.in
similarity index 95%
rename from ground/openpilotgcs/src/app/qtconf.qrc
rename to ground/openpilotgcs/src/app/qtconf.qrc.in
index bd4633fa9..8ebe9970f 100644
--- a/ground/openpilotgcs/src/app/qtconf.qrc
+++ b/ground/openpilotgcs/src/app/qtconf.qrc.in
@@ -1,5 +1,5 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource>
-    <file alias="qt/etc/qt.conf">qt.conf</file>
-</qresource>
-</RCC>
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+    <file alias="qt/etc/qt.conf">qt.conf</file>
+</qresource>
+</RCC>