From d4cd0a9f89281985fdb00a455bdd201fb8a4b701 Mon Sep 17 00:00:00 2001 From: PT_Dreamer Date: Wed, 12 Sep 2012 13:39:35 +0100 Subject: [PATCH] GCS- Config fix and new copy method for data collections --- .../openpilotgcs/default_configurations/OpenPilotGCS.xml | 5 +++-- ground/openpilotgcs/share/share.pro | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ground/openpilotgcs/share/openpilotgcs/default_configurations/OpenPilotGCS.xml b/ground/openpilotgcs/share/openpilotgcs/default_configurations/OpenPilotGCS.xml index 25f56284b..3445e0b17 100644 --- a/ground/openpilotgcs/share/openpilotgcs/default_configurations/OpenPilotGCS.xml +++ b/ground/openpilotgcs/share/openpilotgcs/default_configurations/OpenPilotGCS.xml @@ -2,8 +2,9 @@ true true - None -
None
+ false + Default configuration +
Default configuration built to work on all screen sizes
false en_AU true diff --git a/ground/openpilotgcs/share/share.pro b/ground/openpilotgcs/share/share.pro index c5fa73e60..31b545e71 100644 --- a/ground/openpilotgcs/share/share.pro +++ b/ground/openpilotgcs/share/share.pro @@ -9,7 +9,8 @@ equals(copydata, 1) { for(dir, DATACOLLECTIONS) { exists($$GCS_SOURCE_TREE/share/openpilotgcs/$$dir) { macx:data_copy.commands += $(COPY_DIR) $$targetPath(\"$$GCS_SOURCE_TREE/share/openpilotgcs/$$dir\") $$targetPath(\"$$GCS_DATA_PATH/\") $$addNewline() - !macx:data_copy.commands += $(COPY_DIR) $$targetPath(\"$$GCS_SOURCE_TREE/share/openpilotgcs/$$dir\") $$targetPath(\"$$GCS_DATA_PATH/$$dir\") $$addNewline() + !macx:data_copy.commands += $(MKDIR) $$targetPath(\"$$GCS_DATA_PATH/$$dir\") $$addNewline() + !macx:data_copy.commands += $(COPY_DIR) $$targetPath(\"$$GCS_SOURCE_TREE/share/openpilotgcs/$$dir\") $$targetPath(\"$$GCS_DATA_PATH/\") $$addNewline() } }