Merge branch 'master' of ssh://gerrit.automotivelinux.org:29418/AGL/meta-agl-demo into albacore

Change-Id: Ieedfdda7a1be86c626c6f67b57fed05adb628a87
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>

1 files changed, 18 insertions, 0 deletions

diff --git a/recipes-automotive/climatecontrolplugin/files/climatecontrol_plugin.cpp b/recipes-automotive/climatecontrolplugin/files/climatecontrol_plugin.cpp
new file mode 100644
index 000000000..cd53da0da
--- /dev/null
+++ b/recipes-automotive/climatecontrolplugin/files/climatecontrol_plugin.cpp
@@ -0,0 +1,18 @@
+/* Copyright (C) 2015, Jaguar Land Rover. All Rights Reserved.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "climatecontrol_plugin.h"
+#include "climatecontrol.h"
+
+#include <qqml.h>
+
+void ClimateControlPlugin::registerTypes(const char *uri)
+{
+    Q_ASSERT(uri == QLatin1String("Automotive.ClimateControl"));
+
+    // @uri Automotive.ClimateControl
+    qmlRegisterType<ClimateControl>(uri, 1, 0, "ClimateControlItem");
+}