From 4b79427b02d2de56a320a0a844ec2062b7567b11 Mon Sep 17 00:00:00 2001 From: James Duley Date: Fri, 26 Jun 2015 04:30:01 +1200 Subject: [PATCH 1/2] OP-1929 fix broken pakage_src by moving include after --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index beb06ec3c..4b9676bf3 100644 --- a/Makefile +++ b/Makefile @@ -721,11 +721,11 @@ PACKAGE_NAME := OpenPilot PACKAGE_SEP := - PACKAGE_FULL_NAME := $(PACKAGE_NAME)$(PACKAGE_SEP)$(PACKAGE_LBL) -include $(ROOT_DIR)/package/$(UNAME).mk - # Source distribution is never dirty because it uses git archive DIST_NAME := $(DIST_DIR)/$(subst dirty-,,$(PACKAGE_FULL_NAME)).tar +include $(ROOT_DIR)/package/$(UNAME).mk + ############################## # # Source code formatting From 67aaa1fd196707143615ef968fa752e5e02668e4 Mon Sep 17 00:00:00 2001 From: James Duley Date: Fri, 26 Jun 2015 08:11:52 +1200 Subject: [PATCH 2/2] fix usagetracker to compile with qt < 5.4 --- .../src/plugins/usagetracker/usagetrackerplugin.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ground/openpilotgcs/src/plugins/usagetracker/usagetrackerplugin.cpp b/ground/openpilotgcs/src/plugins/usagetracker/usagetrackerplugin.cpp index 5cebee5af..7c25f784a 100644 --- a/ground/openpilotgcs/src/plugins/usagetracker/usagetrackerplugin.cpp +++ b/ground/openpilotgcs/src/plugins/usagetracker/usagetrackerplugin.cpp @@ -166,7 +166,11 @@ void UsageTrackerPlugin::collectUsageParameters(QMap ¶mete parameters["bl_version"] = QString::number(utilMngr->getBootloaderRevision()); parameters["fw_tag"] = devDesc.gitTag; parameters["fw_hash"] = devDesc.gitHash; +#if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)) parameters["os_version"] = QSysInfo::prettyProductName() + " " + QSysInfo::currentCpuArchitecture(); +#else + parameters["os_version"] = "none"; +#endif parameters["os_threads"] = QString::number(QThread::idealThreadCount()); parameters["os_timezone"] = QTimeZone::systemTimeZoneId(); parameters["gcs_version"] = VersionInfo::revision();