diff --git a/ground/openpilotgcs/copydata.pro b/ground/openpilotgcs/copydata.pro
index 2e3f56306..d14a816eb 100644
--- a/ground/openpilotgcs/copydata.pro
+++ b/ground/openpilotgcs/copydata.pro
@@ -3,7 +3,7 @@ include(openpilotgcs.pri)
 TEMPLATE = subdirs
 
 # Copy Qt runtime libraries into the build directory (to run or package)
-equals(copydata, 1) {
+equals(copyqt, 1) {
 
 GCS_LIBRARY_PATH
 
diff --git a/ground/openpilotgcs/openpilotgcs.pri b/ground/openpilotgcs/openpilotgcs.pri
index 31c0ed454..fd97c3c96 100644
--- a/ground/openpilotgcs/openpilotgcs.pri
+++ b/ground/openpilotgcs/openpilotgcs.pri
@@ -83,16 +83,26 @@ macx {
     GCS_DATA_BASENAME = Resources
     GCS_DOC_PATH     = $$GCS_DATA_PATH/doc
     copydata = 1
+    copyqt = 1
 } else {
+    !isEqual(GCS_SOURCE_TREE, $$GCS_BUILD_TREE):copydata = 1
     win32 {
         contains(TEMPLATE, vc.*)|contains(TEMPLATE_PREFIX, vc):vcproj = 1
         GCS_APP_TARGET   = openpilotgcs
+        copyqt = $$copydata
     } else {
         GCS_APP_WRAPPER  = openpilotgcs
         GCS_APP_TARGET   = openpilotgcs.bin
         GCS_QT_LIBRARY_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/qt5
         GCS_QT_PLUGINS_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/qt5/plugins
         GCS_QT_QML_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/qt5/qml
+        lib_dir_is_in_tools = $$[QT_INSTALL_LIBS]
+        lib_dir_is_in_tools ~= s,$$(TOOLS_DIR)*,TRUE
+        equals(lib_dir_is_in_tools, "TRUE") {
+            copyqt = 1
+        } else {
+            copyqt = 0
+        }
     }
     GCS_LIBRARY_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/openpilotgcs
     GCS_PLUGIN_PATH  = $$GCS_LIBRARY_PATH/plugins
@@ -100,7 +110,6 @@ macx {
     GCS_DATA_PATH    = $$GCS_BUILD_TREE/share/openpilotgcs
     GCS_DATA_BASENAME = share/openpilotgcs
     GCS_DOC_PATH     = $$GCS_BUILD_TREE/share/doc
-    !isEqual(GCS_SOURCE_TREE, $$GCS_BUILD_TREE):copydata = 1
 }