Mocks need QGCSingleton which does not register

src/QGCSingleton.cc

@@ -29,8 +29,10 @@
 #include "QGCSingleton.h"
 #include "QGCApplication.h"
 
-QGCSingleton::QGCSingleton(QObject* parent) :
+QGCSingleton::QGCSingleton(QObject* parent, bool registerSingleton) :
     QObject(parent)
 {
-    qgcApp()->registerSingleton(this);
+    if (registerSingleton) {
+        qgcApp()->registerSingleton(this);
+    }
 }

src/QGCSingleton.h

@@ -39,7 +39,9 @@ class QGCSingleton : public QObject
     
 public:
     /// @brief Contructor will register singleton to QGCApplication
-    QGCSingleton(QObject* parent = NULL);
+    ///     @param parent Parent object
+    ///     @param registerSingleton true: register with QGCApplication, false: do not register (only used for Mock implementations)
+    QGCSingleton(QObject* parent = NULL, bool registerSingleton = true);
     
     /// @brief Implementation should delete the singleton such that next call to instance
     ///         will create a new singleton.

src/qgcunittest/MockUASManager.cc

@@ -24,6 +24,7 @@
 #include "MockUASManager.h"
 
 MockUASManager::MockUASManager(void) :
+    UASManagerInterface(NULL, false /* do not register singleton with QGCApplication */),
     _mockUAS(NULL)
 {
     

src/uas/UASManagerInterface.h

@@ -57,7 +57,10 @@ class UASManagerInterface : public QGCSingleton
     Q_OBJECT
     
 public:
-    UASManagerInterface(QObject* parent = NULL) : QGCSingleton(parent) { }
+    /// @brief Contructor will register singleton to QGCApplication
+    ///     @param parent Parent object
+    ///     @param registerSingleton true: register with QGCApplication, false: do not register (only used for Mock implementations)
+    UASManagerInterface(QObject* parent = NULL, bool registerSingleton = true) : QGCSingleton(parent, registerSingleton) { }
     
     virtual UASInterface* getActiveUAS() = 0;
     virtual UASWaypointManager *getActiveUASWaypointManager() = 0;