From 240f862196a3f1559f205aa3b65ef44bd851cd6c Mon Sep 17 00:00:00 2001
From: James Duley <jagduley@gmail.com>
Date: Sat, 10 Jan 2015 00:19:40 +1300
Subject: [PATCH] OP-1666 deb tidy: Removed FORCE_COPY_QT It does not really
 make sense because it is designed for OP Qt which is copied by default if it
 exists.

---
 Makefile                             | 3 ---
 ground/openpilotgcs/openpilotgcs.pri | 5 +----
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index e363b7bd6..eec66f183 100644
--- a/Makefile
+++ b/Makefile
@@ -783,9 +783,6 @@ ifneq ($(strip $(filter package clean_package,$(MAKECMDGOALS))),)
     export PACKAGE_NAME := OpenPilot
     export PACKAGE_SEP  := -
 
-    # Copy the Qt libraries regardless whether the building machine needs them to run GCS
-    export FORCE_COPY_QT := true
-
     # We can only package release builds
     ifneq ($(GCS_BUILD_CONF),release)
         $(error Packaging is currently supported for release builds only)
diff --git a/ground/openpilotgcs/openpilotgcs.pri b/ground/openpilotgcs/openpilotgcs.pri
index 943dac262..eecc0a4cf 100644
--- a/ground/openpilotgcs/openpilotgcs.pri
+++ b/ground/openpilotgcs/openpilotgcs.pri
@@ -120,11 +120,8 @@ macx {
         equals(QT_INSTALL_DIR, $$TOOLS_DIR) {
             copyqt = 1
         } else {
-            copyqt = 0 
+            copyqt = 0
         }
-
-        FORCE_COPY_QT = $$(FORCE_COPY_QT)
-        !isEmpty(FORCE_COPY_QT):copyqt = 1 
     }
     GCS_LIBRARY_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/openpilotgcs
     GCS_PLUGIN_PATH  = $$GCS_LIBRARY_PATH/plugins