Merge branch 'next' into kenz/hitl_merge

Conflicts:
	ground/openpilotgcs/src/plugins/plugins.pro

Makefile

@@ -32,6 +32,7 @@ $(foreach var, $(SANITIZE_DEPRECATED_VARS), $(eval $(call SANITIZE_VAR,$(var),de
 QT_SPEC=win32-g++
 UAVOBJGENERATOR="$(BUILD_DIR)/ground/uavobjgenerator/debug/uavobjgenerator.exe"
 UNAME := $(shell uname)
+ARCH := $(shell uname -m)
 ifeq ($(UNAME), Linux)
   QT_SPEC=linux-g++
   UAVOBJGENERATOR="$(BUILD_DIR)/ground/uavobjgenerator/uavobjgenerator"
@@ -161,10 +162,16 @@ $(BUILD_DIR):
 QT_SDK_DIR := $(TOOLS_DIR)/qtsdk-v1.2.1
 
 .PHONY: qt_sdk_install
+# Choose the appropriate installer based on host architecture
+ifneq (,$(filter $(ARCH), x86_64 amd64))
+# 64-bit
+qt_sdk_install: QT_SDK_FILE := QtSdk-offline-linux-x86_64-v1.2.1.run
+qt_sdk_install: QT_SDK_URL := http://www.developer.nokia.com/dp?uri=http://sw.nokia.com/id/14b2039c-0e1f-4774-a4f2-9aa60b6d5313/Qt_SDK_Lin64_offline
+else
+# 32-bit
 qt_sdk_install: QT_SDK_URL  := http://www.developer.nokia.com/dp?uri=http://sw.nokia.com/id/8ea74da4-fec1-4277-8b26-c58cc82e204b/Qt_SDK_Lin32_offline
 qt_sdk_install: QT_SDK_FILE := QtSdk-offline-linux-x86-v1.2.1.run
-#qt_sdk_install: QT_SDK_URL  := http://www.developer.nokia.com/dp?uri=http://sw.nokia.com/id/c365bbf5-c2b9-4dda-9c1f-34b2c8d07785/Qt_SDK_Lin32_offline_v1_1_2
+endif
-#qt_sdk_install: QT_SDK_FILE := Qt_SDK_Lin32_offline_v1_1_2_en.run
 # order-only prereq on directory existance:
 qt_sdk_install : | $(DL_DIR) $(TOOLS_DIR)
 qt_sdk_install: qt_sdk_clean

ground/openpilotgcs/src/app/main.cpp

@@ -252,7 +252,7 @@ int main(int argc, char **argv)
             QCoreApplication::applicationDirPath()+QLatin1String(SHARE_PATH));
     // keep this in sync with the MainWindow ctor in coreplugin/mainwindow.cpp
     QSettings settings(XmlConfig::XmlSettingsFormat, QSettings::UserScope,
-                                 QLatin1String("OpenPilot"), QLatin1String("OpenPilotGCS"));
+                                 QLatin1String("OpenPilot"), QLatin1String("OpenPilotGCS_config"));
 
     overrideSettings(settings, argc, argv);
     locale = settings.value("General/OverrideLanguage", locale).toString();

ground/openpilotgcs/src/libs/utils/pathutils.cpp

@@ -98,7 +98,7 @@ QString PathUtils::GetStoragePath()
 {
     // This routine works with "/" as the standard:
     // Work out where the settings are stored on the machine
-    QSettings set(XmlConfig::XmlSettingsFormat, QSettings::UserScope,QLatin1String("OpenPilot"), QLatin1String("OpenPilotGCS"));
+    QSettings set(XmlConfig::XmlSettingsFormat, QSettings::UserScope,QLatin1String("OpenPilot"), QLatin1String("OpenPilotGCS_config"));
     QFileInfo f(set.fileName());
     QDir dir(f.absoluteDir());
 

ground/openpilotgcs/src/plugins/coreplugin/mainwindow.cpp

@@ -102,11 +102,11 @@ MainWindow::MainWindow() :
     m_additionalContexts(m_globalContext),
     // keep this in sync with main() in app/main.cpp
     m_settings(new QSettings(XmlConfig::XmlSettingsFormat, QSettings::UserScope,
-                             QLatin1String("OpenPilot"), QLatin1String("OpenPilotGCS"), this)),
+                             QLatin1String("OpenPilot"), QLatin1String("OpenPilotGCS_config"), this)),
     m_globalSettings(new QSettings(XmlConfig::XmlSettingsFormat, QSettings::SystemScope,
-                                 QLatin1String("OpenPilot"), QLatin1String("OpenPilotGCS"), this)),
+                                 QLatin1String("OpenPilot"), QLatin1String("OpenPilotGCS_config"), this)),
     m_settingsDatabase(new SettingsDatabase(QFileInfo(m_settings->fileName()).path(),
-                                            QLatin1String("OpenPilotGCS"),
+                                            QLatin1String("OpenPilotGCS_config"),
                                             this)),
     m_dontSaveSettings(false),
     m_actionManager(new ActionManagerPrivate(this)),

ground/openpilotgcs/src/plugins/plugins.pro

@@ -10,7 +10,6 @@ SUBDIRS   = plugin_coreplugin
 #plugin_donothing.subdir = donothing
 #plugin_donothing.depends = plugin_coreplugin
 
-
 # Core plugin
 plugin_coreplugin.subdir = coreplugin
 
@@ -55,12 +54,14 @@ plugin_opmap.subdir = opmap
 plugin_opmap.depends = plugin_coreplugin
 plugin_opmap.depends += plugin_uavobjects
 plugin_opmap.depends += plugin_uavobjectutil
+plugin_opmap.depends += plugin_uavtalk
 SUBDIRS += plugin_opmap
 
 # Scope UAVGadget
 plugin_scope.subdir = scope
 plugin_scope.depends = plugin_coreplugin
 plugin_scope.depends += plugin_uavobjects
+plugin_scope.depends += plugin_uavtalk
 SUBDIRS += plugin_scope
 
 # UAVObject Browser gadget
@@ -75,57 +76,60 @@ plugin_modelview.depends = plugin_coreplugin
 plugin_modelview.depends += plugin_uavobjects
 SUBDIRS += plugin_modelview
 
-
 #Qt 4.8.0 / phonon may crash on Mac, fixed in Qt 4.8.1, QTBUG-23128
 macx:contains(QT_VERSION, ^4\\.8\\.0): CONFIG += disable_notify_plugin
 
+# Notify gadget
 !disable_notify_plugin {
-#Notify gadget
+    plugin_notify.subdir = notify
-plugin_notify.subdir = notify
+    plugin_notify.depends = plugin_coreplugin
-plugin_notify.depends = plugin_coreplugin
+    plugin_notify.depends += plugin_uavobjects
-plugin_notify.depends += plugin_uavobjects
+    plugin_notify.depends += plugin_uavtalk
-SUBDIRS += plugin_notify
+    SUBDIRS += plugin_notify
 }
 
-#Uploader gadget
+# Uploader gadget
 plugin_uploader.subdir = uploader
 plugin_uploader.depends = plugin_coreplugin
 plugin_uploader.depends += plugin_uavobjects
+plugin_uploader.depends += plugin_uavtalk
 plugin_uploader.depends += plugin_rawhid
 plugin_uploader.depends += plugin_uavobjectutil
 SUBDIRS += plugin_uploader
 
-#Dial gadget
+# Dial gadget
 plugin_dial.subdir = dial
 plugin_dial.depends = plugin_coreplugin
 plugin_dial.depends += plugin_uavobjects
 SUBDIRS += plugin_dial
 
-#Linear Dial gadget
+# Linear Dial gadget
 plugin_lineardial.subdir = lineardial
 plugin_lineardial.depends = plugin_coreplugin
 plugin_lineardial.depends += plugin_uavobjects
 SUBDIRS += plugin_lineardial
 
-#System Health gadget
+# System Health gadget
 plugin_systemhealth.subdir = systemhealth
 plugin_systemhealth.depends = plugin_coreplugin
 plugin_systemhealth.depends += plugin_uavobjects
 plugin_systemhealth.depends += plugin_uavtalk
 SUBDIRS += plugin_systemhealth
 
-#Config gadget
+# Config gadget
 plugin_config.subdir = config
 plugin_config.depends = plugin_coreplugin
+plugin_config.depends += plugin_uavtalk
 plugin_config.depends += plugin_uavobjects
+plugin_config.depends += plugin_uavobjectutil
 plugin_config.depends += plugin_uavobjectwidgetutils
 plugin_config.depends += plugin_uavsettingsimportexport
 SUBDIRS += plugin_config
 
-#GPS Display gadget
+# GPS Display gadget
 plugin_gpsdisplay.subdir = gpsdisplay
 plugin_gpsdisplay.depends = plugin_coreplugin
-plugin_gpsdisplay.depends += plugin_uavtalk
+plugin_gpsdisplay.depends += plugin_uavobjects
 SUBDIRS += plugin_gpsdisplay
 
 # Primary Flight Display (PFD) gadget
@@ -146,7 +150,7 @@ plugin_pfdqml.depends = plugin_coreplugin
 plugin_pfdqml.depends += plugin_uavobjects
 SUBDIRS += plugin_pfdqml
 
-#IP connection plugin
+# IP connection plugin
 plugin_ipconnection.subdir = ipconnection
 plugin_ipconnection.depends = plugin_coreplugin
 SUBDIRS += plugin_ipconnection
@@ -171,20 +175,19 @@ plugin_logging.depends += plugin_uavtalk
 plugin_logging.depends += plugin_scope
 SUBDIRS += plugin_logging
 
-#GCS Control of UAV gadget
+# GCS Control of UAV gadget
 plugin_gcscontrol.subdir = gcscontrol
 plugin_gcscontrol.depends = plugin_coreplugin
 plugin_gcscontrol.depends += plugin_uavobjects
-plugin_gcscontrol.depends += plugin_uavtalk
 SUBDIRS += plugin_gcscontrol
 
 # Antenna tracker
 #plugin_antennatrack.subdir = antennatrack
 #plugin_antennatrack.depends = plugin_coreplugin
-#plugin_antennatrack.depends += plugin_uavtalk
+#plugin_antennatrack.depends += plugin_uavobjects
 #SUBDIRS += plugin_antennatrack
 
-#Scope OpenGL Gadget
+# Scope OpenGL Gadget
 #plugin_scopeogl.subdir = scopeogl
 #plugin_scopeogl.depends = plugin_coreplugin
 #plugin_scopeogl.depends += plugin_uavobjects
@@ -206,6 +209,7 @@ SUBDIRS += plugin_magicwaypoint
 plugin_uavsettingsimportexport.subdir = uavsettingsimportexport
 plugin_uavsettingsimportexport.depends = plugin_coreplugin
 plugin_uavsettingsimportexport.depends += plugin_uavobjects
+plugin_uavsettingsimportexport.depends += plugin_uavobjectutil
 SUBDIRS += plugin_uavsettingsimportexport
 
 # UAV Object Widget Utility plugin
@@ -214,12 +218,13 @@ plugin_uavobjectwidgetutils.depends = plugin_coreplugin
 plugin_uavobjectwidgetutils.depends += plugin_uavobjects
 plugin_uavobjectwidgetutils.depends += plugin_uavobjectutil
 plugin_uavobjectwidgetutils.depends += plugin_uavsettingsimportexport
+plugin_uavobjectwidgetutils.depends += plugin_uavtalk
 SUBDIRS += plugin_uavobjectwidgetutils
 
 # Setup Wizard plugin
 plugin_setupwizard.subdir = setupwizard
 plugin_setupwizard.depends = plugin_coreplugin
-plugin_setupwizard.depends += plugin_uavobjects
+plugin_setupwizard.depends += plugin_uavobjectutil
 plugin_setupwizard.depends += plugin_config
 SUBDIRS += plugin_setupwizard
 

ground/openpilotgcs/src/plugins/uavobjectwidgetutils/uavobjectwidgetutils_dependencies.pri

@@ -1,6 +1,6 @@
 include(../../plugins/coreplugin/coreplugin.pri)
 include(../../libs/utils/utils.pri)
 include(../../plugins/uavobjects/uavobjects.pri)
-include(../uavobjectutil/uavobjectutil.pri)
+include(../../plugins/uavobjectutil/uavobjectutil.pri)
-include(../uavsettingsimportexport/uavsettingsimportexport.pri)
+include(../../plugins/uavsettingsimportexport/uavsettingsimportexport.pri)
-include(../uavtalk/uavtalk.pri)
+include(../../plugins/uavtalk/uavtalk.pri)