From b63765304c7b43fa712f0c8744531463ee3d8d6f Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Fri, 27 Feb 2015 18:45:31 -0800
Subject: [PATCH] Add setContextPropertyObject api

---
 src/QGCQmlWidgetHolder.cpp | 7 ++++++-
 src/QGCQmlWidgetHolder.h   | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/QGCQmlWidgetHolder.cpp b/src/QGCQmlWidgetHolder.cpp
index 844ac5132..a73ad18f8 100644
--- a/src/QGCQmlWidgetHolder.cpp
+++ b/src/QGCQmlWidgetHolder.cpp
@@ -40,10 +40,15 @@ QGCQmlWidgetHolder::~QGCQmlWidgetHolder()
 
 void QGCQmlWidgetHolder::setAutoPilot(AutoPilotPlugin* autoPilot)
 {
-    _ui.qmlWidget->rootContext()->setContextProperty("autopilot", autoPilot);
+    setContextPropertyObject("autopilot", autoPilot);
 }
 
 bool QGCQmlWidgetHolder::setSource(const QUrl& qmlUrl)
 {
     return _ui.qmlWidget->setSource(qmlUrl);
 }
+
+void QGCQmlWidgetHolder::setContextPropertyObject(const QString& name, QObject* object)
+{
+    _ui.qmlWidget->rootContext()->setContextProperty(name, object);
+}
diff --git a/src/QGCQmlWidgetHolder.h b/src/QGCQmlWidgetHolder.h
index 378e50199..49dbe63c0 100644
--- a/src/QGCQmlWidgetHolder.h
+++ b/src/QGCQmlWidgetHolder.h
@@ -52,6 +52,8 @@ public:
     /// Sets the QML into the control. Will display errors message box if error occurs loading source.
     ///     @return true: source loaded, false: source not loaded, errors occured
     bool setSource(const QUrl& qmlUrl);
+    
+    void setContextPropertyObject(const QString& name, QObject* object);
 
 private:
     Ui::QGCQmlWidgetHolder _ui;
-- 
2.22.0