From 55f3c91e9fd3301a0f3b3521ced8aaf3651eb1dc Mon Sep 17 00:00:00 2001
From: Paul Jewell <paul@teulu.org>
Date: Fri, 18 Sep 2015 06:46:36 +0100
Subject: [PATCH] Moved question mark to code & added missing define

---
 Makefile                                                   | 3 ++-
 ground/gcs/gcs.pri                                         | 1 -
 ground/gcs/src/plugins/usagetracker/usagetrackerplugin.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 96a728f29..940e6a1de 100644
--- a/Makefile
+++ b/Makefile
@@ -63,7 +63,7 @@ GCS_SMALL_NAME := $(call smallify,$(GCS_BIG_NAME))
 # Change this once the DNS is set to http://wiki.librepilot.org/
 WIKI_URL_ROOT := https://librepilot.atlassian.net/wiki/display/LPDOC/
 
-USAGETRACKER_URL := https://usagetracker.librepilot.org/?
+USAGETRACKER_URL := https://usagetracker.librepilot.org/
 
 # Set up default build configurations (debug | release)
 GCS_BUILD_CONF		:= release
@@ -251,6 +251,7 @@ gcs_qmake $(GCS_MAKEFILE): | $(GCS_DIR)
 	    'GCS_BIG_NAME="$(GCS_BIG_NAME)"' GCS_SMALL_NAME=$(GCS_SMALL_NAME) \
 	    'ORG_BIG_NAME="$(ORG_BIG_NAME)"' ORG_SMALL_NAME=$(ORG_SMALL_NAME) \
 	    'WIKI_URL_ROOT="$(WIKI_URL_ROOT)"' \
+	    'USAGETRACKER_URL="$(USAGETRACKER_URL)"' \
 	    'GCS_LIBRARY_BASENAME=$(libbasename)' \
 	    $(GCS_QMAKE_OPTS)
 
diff --git a/ground/gcs/gcs.pri b/ground/gcs/gcs.pri
index 752fac936..143b34daa 100644
--- a/ground/gcs/gcs.pri
+++ b/ground/gcs/gcs.pri
@@ -146,7 +146,6 @@ isEmpty(WIKI_URL_ROOT) {
     WIKI_URL_ROOT = "$$WIKI_URL_ROOT"
 }
 
-
 isEmpty(GCS_LIBRARY_BASENAME):GCS_LIBRARY_BASENAME = lib
 
 macx {
diff --git a/ground/gcs/src/plugins/usagetracker/usagetrackerplugin.cpp b/ground/gcs/src/plugins/usagetracker/usagetrackerplugin.cpp
index 47707dccc..71ee35b8b 100644
--- a/ground/gcs/src/plugins/usagetracker/usagetrackerplugin.cpp
+++ b/ground/gcs/src/plugins/usagetracker/usagetrackerplugin.cpp
@@ -139,7 +139,7 @@ void UsageTrackerPlugin::trackUsage()
     if (shouldSend(hash)) {
         query.addQueryItem("hash", hash);
 
-        QUrl url(QString(USAGETRACKER_URL) + query.toString(QUrl::FullyEncoded));
+        QUrl url(QString(USAGETRACKER_URL) + "?" + query.toString(QUrl::FullyEncoded));
 
         QNetworkAccessManager *networkAccessManager = new QNetworkAccessManager();
 
-- 
2.11.4.GIT