From 9da1372e54768b7307f5b8de3f07655f6ca83d29 Mon Sep 17 00:00:00 2001 From: PT_Dreamer Date: Thu, 9 Aug 2012 22:25:34 +0100 Subject: [PATCH] GCS-Change the way the stylesheets are copied (was not working for me) Also copy the default configuration xml files. These are now on the shared folder together with the stylesheet instead of being inside a resource file. Stylesheets and configuration files are now copied from SRC/SHARED to APP/SHARED --- ground/openpilotgcs/share/share.pro | 2 +- ground/openpilotgcs/src/app/app.pro | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/ground/openpilotgcs/share/share.pro b/ground/openpilotgcs/share/share.pro index e6ecc4243..c5fa73e60 100644 --- a/ground/openpilotgcs/share/share.pro +++ b/ground/openpilotgcs/share/share.pro @@ -3,7 +3,7 @@ include(../openpilotgcs.pri) TEMPLATE = subdirs SUBDIRS = openpilotgcs/translations -DATACOLLECTIONS = dials models pfd sounds diagrams mapicons +DATACOLLECTIONS = dials models pfd sounds diagrams mapicons stylesheets default_configurations equals(copydata, 1) { for(dir, DATACOLLECTIONS) { diff --git a/ground/openpilotgcs/src/app/app.pro b/ground/openpilotgcs/src/app/app.pro index ea53c1bd9..d045eb593 100644 --- a/ground/openpilotgcs/src/app/app.pro +++ b/ground/openpilotgcs/src/app/app.pro @@ -28,15 +28,3 @@ win32 { } OTHER_FILES += openpilotgcs.rc - -STYLESHEETS = windows.qss \ - macos.qss \ - linux.qss - -for(qss, STYLESHEETS) { - style_copy.commands += $(COPY_FILE) $$targetPath(\"$$GCS_SOURCE_TREE/src/app/stylesheets/$$qss\") $$targetPath(\"$$GCS_APP_PATH/$$qss\") $$addNewline() -} - -style_copy.target = FORCE -QMAKE_EXTRA_TARGETS += style_copy -