rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-20 10:54:14 +01:00
Code Issues Releases Activity

Moved definition of usagetracker url to top level Makefile

Browse Source
This commit is contained in:
Paul Jewell 2015-09-16 21:59:42 +01:00
parent 1a6ff50d20
commit 7a97e5fbbb
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -63,6 +63,8 @@ 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/?
# Set up default build configurations (debug | release)
GCS_BUILD_CONF := release
GOOGLE_API_VERSION := 14

7
ground/gcs/gcs.pri
View File

@ -146,6 +146,12 @@ 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
macx {
@ -216,6 +222,7 @@ 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

2
ground/gcs/src/plugins/usagetracker/usagetrackerplugin.cpp
View File

@ -139,7 +139,7 @@ void UsageTrackerPlugin::trackUsage()
if (shouldSend(hash)) {
query.addQueryItem("hash", hash);
QUrl url("https://usagetracker.librepilot.org/?" + query.toString(QUrl::FullyEncoded));
QUrl url(QString(USAGETRACKER_URL) + query.toString(QUrl::FullyEncoded));
QNetworkAccessManager *networkAccessManager = new QNetworkAccessManager();