From 0a45bc6a4ea6c33a4b6a734992f9d8d4ad03a3c3 Mon Sep 17 00:00:00 2001 From: Paul Jewell Date: Fri, 18 Sep 2015 06:18:16 +0100 Subject: [PATCH] Moved usagetracker defines to usagetracker.pri --- ground/gcs/gcs.pri | 6 ------ ground/gcs/src/plugins/usagetracker/usagetracker.pri | 7 +++++++ ground/gcs/src/plugins/usagetracker/usagetracker.pro | 1 + 3 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 ground/gcs/src/plugins/usagetracker/usagetracker.pri diff --git a/ground/gcs/gcs.pri b/ground/gcs/gcs.pri index d21a5461e..752fac936 100644 --- a/ground/gcs/gcs.pri +++ b/ground/gcs/gcs.pri @@ -146,11 +146,6 @@ isEmpty(WIKI_URL_ROOT) { WIKI_URL_ROOT = "$$WIKI_URL_ROOT" } -isEmpty(USAGETRACKER_URL) { - USAGETRACKER_URL = Unknown -} else { - USAGETRACKER_URL = "$$USAGETRACKER_URL" -} isEmpty(GCS_LIBRARY_BASENAME):GCS_LIBRARY_BASENAME = lib @@ -222,7 +217,6 @@ DEFINES += GCS_BIG_NAME=$$shell_quote(\"$$GCS_BIG_NAME\") DEFINES += ORG_SMALL_NAME=$$shell_quote(\"$$ORG_SMALL_NAME\") DEFINES += GCS_SMALL_NAME=$$shell_quote(\"$$GCS_SMALL_NAME\") DEFINES += WIKI_URL_ROOT=$$shell_quote(\"$$WIKI_URL_ROOT\") -DEFINES += USAGETRACKER_URL=$$shell_quote(\"$$USAGETRACKER_URL\") # DEFINES += QT_NO_CAST_FROM_ASCII DEFINES += QT_NO_CAST_TO_ASCII diff --git a/ground/gcs/src/plugins/usagetracker/usagetracker.pri b/ground/gcs/src/plugins/usagetracker/usagetracker.pri new file mode 100644 index 000000000..c69d13f00 --- /dev/null +++ b/ground/gcs/src/plugins/usagetracker/usagetracker.pri @@ -0,0 +1,7 @@ +isEmpty(USAGETRACKER_URL) { + USAGETRACKER_URL = Unknown +} else { + USAGETRACKER_URL = "$$USAGETRACKER_URL" +} + +DEFINES += USAGETRACKER_URL=$$shell_quote(\"$$USAGETRACKER_URL\") diff --git a/ground/gcs/src/plugins/usagetracker/usagetracker.pro b/ground/gcs/src/plugins/usagetracker/usagetracker.pro index 676d93e2f..eb3f9aea9 100644 --- a/ground/gcs/src/plugins/usagetracker/usagetracker.pro +++ b/ground/gcs/src/plugins/usagetracker/usagetracker.pro @@ -3,6 +3,7 @@ TEMPLATE = lib TARGET = UsageTracker QT += network +include(usagetracker.pri) include(../../plugin.pri) include(../../libs/version_info/version_info.pri) include(../../plugins/coreplugin/coreplugin.pri)