2 files changed, 58 insertions, 4 deletions
diff --git a/src/imports/vehiclefunctions/plugin.cpp b/src/imports/vehiclefunctions/plugin.cpp
index 1f79d17..f268562 100644
--- a/src/imports/vehiclefunctions/plugin.cpp
+++ b/src/imports/vehiclefunctions/plugin.cpp
@@ -43,8 +43,7 @@
 #include <QtQml/qqmlextensionplugin.h>
 #include <qqml.h>
 
-#include <QtIviVehicleFunctions/QIviClimateControl>
-#include <QtIviVehicleFunctions/QIviWindowControl>
+#include <QtIviVehicleFunctions/QtIviVehicleFunctionsModuleFactory>
 
 QT_BEGIN_NAMESPACE
 
@@ -58,8 +57,7 @@ public:
         Q_ASSERT(QLatin1String(uri) == QLatin1String("QtIvi.VehicleFunctions"));
         Q_UNUSED(uri);
 
-        QIviClimateControl::registerQmlTypes(uri, 1, 0);
-        QIviWindowControl::registerQmlTypes(uri, 1, 0);
+        QtIviVehicleFunctionsModuleFactory::registerQmlTypes(uri, 1, 0);
     }
 };
 
diff --git a/src/imports/vehiclefunctions/plugins.qmltypes b/src/imports/vehiclefunctions/plugins.qmltypes
index a891d45..d7e5a92 100644
--- a/src/imports/vehiclefunctions/plugins.qmltypes
+++ b/src/imports/vehiclefunctions/plugins.qmltypes
@@ -298,4 +298,60 @@ Module {
             Parameter { name: "blindMode"; type: "QtIviVehicleFunctionsModule::BlindMode" }
         }
     }
+    Component {
+        name: "QtIviVehicleFunctionsModule"
+        prototype: "QObject"
+        exports: ["QtIvi.VehicleFunctions/VehicleFunctions 1.0"]
+        isCreatable: false
+        isSingleton: true
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "AirflowDirections"
+            values: {
+                "Windshield": 1,
+                "Dashboard": 2,
+                "Floor": 4
+            }
+        }
+        Enum {
+            name: "RecirculationMode"
+            values: {
+                "RecirculationOff": 0,
+                "RecirculationOn": 1,
+                "AutoRecirculation": 2
+            }
+        }
+        Enum {
+            name: "ClimateMode"
+            values: {
+                "ClimateOff": 0,
+                "ClimateOn": 1,
+                "AutoClimate": 2
+            }
+        }
+        Enum {
+            name: "HeaterMode"
+            values: {
+                "HeaterOn": 0,
+                "HeaterOff": 1,
+                "AutoHeater": 2
+            }
+        }
+        Enum {
+            name: "BlindMode"
+            values: {
+                "BlindOpen": 0,
+                "BlindClosed": 1,
+                "AutoBlind": 2
+            }
+        }
+        Enum {
+            name: "WindowState"
+            values: {
+                "FullyOpen": 0,
+                "Open": 1,
+                "Closed": 2
+            }
+        }
+    }
 }