bump version 1.1, add qml service registry class

.qmake.conf

@@ -6,7 +6,7 @@ win32:cross_compile: CONFIG += winrt
 DEFINES += QT_DEPRECATED_WARNINGS QT_ASCII_CAST_WARNINGS
 
 MODULE_VERSION_MAJOR = 1
-MODULE_VERSION_MINOR = 0
+MODULE_VERSION_MINOR = 1
-MODULE_VERSION_PATCH = 2
+MODULE_VERSION_PATCH = 0
 MODULE_VERSION_IMPORT = $${MODULE_VERSION_MAJOR}.$${MODULE_VERSION_MINOR}
 MODULE_VERSION = $${MODULE_VERSION_MAJOR}.$${MODULE_VERSION_MINOR}.$${MODULE_VERSION_PATCH}

src/imports/imports.pro

@@ -4,7 +4,12 @@ SUBDIRS += \
 	mvvmcore \
 	mvvmquick
 
+mvvmquick.depends += mvvmcore
+
 qtHaveModule(datasync) {
 	SUBDIRS += mvvmdatasynccore \
 		mvvmdatasyncquick
+
+	mvvmdatasynccore.depends += mvvmcore
+	mvvmdatasyncquick.depends += mvvmdatasynccore mvvmquick
 }

src/imports/mvvmcore/mvvmcore.pro

@@ -9,12 +9,14 @@ DEFINES += "VERSION_MINOR=$$MODULE_VERSION_MINOR"
 HEADERS += \
 	qtmvvmcore_plugin.h \
 	qqmlmvvmbinding.h \
-	qqmlmvvmmessage.h
+	qqmlmvvmmessage.h \
+	qqmlserviceregistry.h
 
 SOURCES += \
 	qtmvvmcore_plugin.cpp \
 	qqmlmvvmbinding.cpp \
-	qqmlmvvmmessage.cpp
+	qqmlmvvmmessage.cpp \
+	qqmlserviceregistry.cpp
 
 OTHER_FILES += qmldir
 

src/imports/mvvmcore/plugins.qmltypes

@@ -4,7 +4,7 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable de.skycoder42.QtMvvm.Core 1.0'
+// 'qmlplugindump -nonrelocatable de.skycoder42.QtMvvm.Core 1.1'
 
 Module {
     dependencies: ["QtQml 2.2"]
@@ -429,6 +429,42 @@ Module {
             Parameter { name: "onResult"; type: "QJSValue" }
         }
     }
+    Component {
+        name: "QtMvvm::QQmlServiceRegistry"
+        prototype: "QObject"
+        exports: ["de.skycoder42.QtMvvm.Core/ServiceRegistry 1.1"]
+        isCreatable: false
+        isSingleton: true
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "DestructionScope"
+            values: {
+                "DestroyOnAppQuit": 1,
+                "DestroyOnAppDestroy": 2,
+                "DestroyOnRegistryDestroy": 3,
+                "DestroyNever": 127
+            }
+        }
+        Method {
+            name: "isRegistered"
+            type: "bool"
+            Parameter { name: "iid"; type: "string" }
+        }
+        Method {
+            name: "registerObject"
+            Parameter { name: "componentUrl"; type: "QUrl" }
+            Parameter { name: "weak"; type: "bool" }
+        }
+        Method {
+            name: "registerObject"
+            Parameter { name: "componentUrl"; type: "QUrl" }
+        }
+        Method {
+            name: "service"
+            type: "QObject*"
+            Parameter { name: "iid"; type: "string" }
+        }
+    }
     Component {
         name: "QtMvvm::SettingsViewModel"
         prototype: "QtMvvm::ViewModel"

src/imports/mvvmcore/qqmlserviceregistry.cpp

@@ -0,0 +1,46 @@
+#include "qqmlserviceregistry.h"
+#include <QtQml/QQmlInfo>
+using namespace QtMvvm;
+
+QQmlServiceRegistry::QQmlServiceRegistry(QQmlEngine *parent) :
+	QObject{parent},
+	_engine{parent}
+{}
+
+bool QQmlServiceRegistry::isRegistered(const QString &iid) const
+{
+	return ServiceRegistry::instance()->isRegistered(iid.toUtf8());
+}
+
+void QQmlServiceRegistry::registerObject(const QUrl &componentUrl, bool weak)
+{
+	ServiceRegistry::instance()->registerService(componentUrl.toString().toUtf8(), [this, componentUrl](const QObjectList &) -> QObject* {
+		QQmlComponent component{_engine, componentUrl, QQmlComponent::PreferSynchronous};
+		switch(component.status()) {
+		case QQmlComponent::Ready:
+		{
+			auto object = component.create();
+			QQmlEngine::setObjectOwnership(object, QQmlEngine::CppOwnership);
+			object->setParent(nullptr);
+			return object;
+		}
+		case QQmlComponent::Null:
+			throw ServiceConstructionException{"No component was loaded for URL: " +
+											   component.url().toString().toUtf8()};
+		case QQmlComponent::Error:
+			throw ServiceConstructionException{"Failed to load componentfor URL \"" + component.url().toString().toUtf8() +
+											   "\" with error: " + component.errorString().trimmed().toUtf8()};
+		case QQmlComponent::Loading:
+			throw ServiceConstructionException{"Unable to construct service from asynchronously loaded URL: " +
+											   component.url().toString().toUtf8()};
+		default:
+			Q_UNREACHABLE();
+			return nullptr;
+		}
+	}, {}, weak, ServiceRegistry::DestroyOnAppQuit);
+}
+
+QObject *QQmlServiceRegistry::service(const QString &iid)
+{
+	return ServiceRegistry::instance()->serviceObj(iid.toUtf8());
+}

src/imports/mvvmcore/qqmlserviceregistry.h

@@ -0,0 +1,41 @@
+#ifndef QTMVVM_QQMLSERVICEREGISTRY_H
+#define QTMVVM_QQMLSERVICEREGISTRY_H
+
+#include <QtCore/QObject>
+
+#include <QtMvvmCore/ServiceRegistry>
+
+#include <QtQml/QQmlEngine>
+#include <QtQml/QQmlComponent>
+
+namespace QtMvvm {
+
+class QQmlServiceRegistry : public QObject
+{
+	Q_OBJECT
+
+public:
+	enum DestructionScope {
+		DestroyOnAppQuit = ServiceRegistry::DestroyOnAppQuit,
+		DestroyOnAppDestroy = ServiceRegistry::DestroyOnAppDestroy,
+		DestroyOnRegistryDestroy = ServiceRegistry::DestroyOnRegistryDestroy,
+
+		DestroyNever = ServiceRegistry::DestroyNever
+	};
+	Q_ENUM(DestructionScope)
+
+	explicit QQmlServiceRegistry(QQmlEngine *parent = nullptr);
+
+	Q_INVOKABLE bool isRegistered(const QString &iid) const;
+
+	Q_INVOKABLE void registerObject(const QUrl &componentUrl, bool weak = false);
+
+	Q_INVOKABLE QObject *service(const QString &iid);
+
+private:
+	QQmlEngine *_engine;
+};
+
+}
+
+#endif // QTMVVM_QQMLSERVICEREGISTRY_H

src/imports/mvvmcore/qtmvvmcore_plugin.cpp

@@ -8,10 +8,17 @@
 
 #include "qqmlmvvmbinding.h"
 #include "qqmlmvvmmessage.h"
+#include "qqmlserviceregistry.h"
 
 static QObject *createMessageSingleton(QQmlEngine *qmlEngine, QJSEngine *jsEngine)
 {
-	return new QtMvvm::QQmlMvvmMessage(jsEngine, qmlEngine);
+	return new QtMvvm::QQmlMvvmMessage{jsEngine, qmlEngine};
+}
+
+static QObject *createRegistrySingleton(QQmlEngine *qmlEngine, QJSEngine *jsEngine)
+{
+	Q_UNUSED(jsEngine)
+	return new QtMvvm::QQmlServiceRegistry{qmlEngine};
 }
 
 QtMvvmCoreDeclarativeModule::QtMvvmCoreDeclarativeModule(QObject *parent) :
@@ -32,6 +39,9 @@ void QtMvvmCoreDeclarativeModule::registerTypes(const char *uri)
 
 	qmlRegisterSingletonType<QtMvvm::QQmlMvvmMessage>(uri, 1, 0, "Message", createMessageSingleton);
 
+	//Version 1.1
+	qmlRegisterSingletonType<QtMvvm::QQmlServiceRegistry>(uri, 1, 1, "ServiceRegistry", createRegistrySingleton);
+
 	// Check to make shure no module update is forgotten
-	static_assert(VERSION_MAJOR == 1 && VERSION_MINOR == 0, "QML module version needs to be updated");
+	static_assert(VERSION_MAJOR == 1 && VERSION_MINOR == 1, "QML module version needs to be updated");
 }

src/imports/mvvmdatasynccore/plugins.qmltypes

@@ -4,7 +4,7 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable de.skycoder42.QtMvvm.DataSync.Core 1.0'
+// 'qmlplugindump -nonrelocatable de.skycoder42.QtMvvm.DataSync.Core 1.1'
 
 Module {
     dependencies: [

src/imports/mvvmdatasynccore/qtmvvmdatasynccore_plugin.cpp

@@ -31,6 +31,9 @@ void QtMvvmDataSyncCoreDeclarativeModule::registerTypes(const char *uri)
 	qmlRegisterUncreatableType<QtMvvm::ChangeRemoteViewModel>(uri, 1, 0, "PChangeRemoteViewModel", QStringLiteral("ViewModels cannot be created from QML"));
 	qmlRegisterUncreatableType<QtMvvm::ExportSetupViewModel>(uri, 1, 0, "PExportSetupViewModel", QStringLiteral("ViewModels cannot be created from QML"));
 
+	//Version 1.1
+	qmlRegisterModule(uri, 1, 1);
+
 	// Check to make shure no module update is forgotten
-	static_assert(VERSION_MAJOR == 1 && VERSION_MINOR == 0, "QML module version needs to be updated");
+	static_assert(VERSION_MAJOR == 1 && VERSION_MINOR == 1, "QML module version needs to be updated");
 }

src/imports/mvvmdatasyncquick/plugins.qmltypes

@@ -4,7 +4,7 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable de.skycoder42.QtMvvm.DataSync.Quick 1.0'
+// 'qmlplugindump -nonrelocatable de.skycoder42.QtMvvm.DataSync.Quick 1.1'
 
 Module {
     dependencies: [

src/imports/mvvmdatasyncquick/qtmvvmdatasyncquick_plugin.cpp

@@ -21,7 +21,11 @@ void QtMvvmDataSyncQuickDeclarativeModule::registerTypes(const char *uri)
 
 	//Version 1.0
 	//no c++ types. plugin is only needed for the resources
+	qmlRegisterModule(uri, 1, 0);
+
+	//Version 1.1
+	qmlRegisterModule(uri, 1, 1);
 
 	// Check to make shure no module update is forgotten
-	static_assert(VERSION_MAJOR == 1 && VERSION_MINOR == 0, "QML module version needs to be updated");
+	static_assert(VERSION_MAJOR == 1 && VERSION_MINOR == 1, "QML module version needs to be updated");
 }

src/imports/mvvmquick/plugins.qmltypes

@@ -4,7 +4,7 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable de.skycoder42.QtMvvm.Quick 1.0'
+// 'qmlplugindump -nonrelocatable de.skycoder42.QtMvvm.Quick 1.1'
 
 Module {
     dependencies: [

src/imports/mvvmquick/qtmvvmquick_plugin.cpp

@@ -48,6 +48,9 @@ void QtMvvmQuickDeclarativeModule::registerTypes(const char *uri)
 	qmlRegisterType(QUrl(QStringLiteral("qrc:/de/skycoder42/qtmvvm/quick/qml/FolderDialog.qml")), uri, 1, 0, "FolderDialog");
 #endif
 
+	//Version 1.1
+	qmlRegisterModule(uri, 1, 1);
+
 	// Check to make shure no module update is forgotten
-	static_assert(VERSION_MAJOR == 1 && VERSION_MINOR == 0, "QML module version needs to be updated");
+	static_assert(VERSION_MAJOR == 1 && VERSION_MINOR == 1, "QML module version needs to be updated");
 }

src/mvvmcore/serviceregistry.h

@@ -14,7 +14,7 @@ namespace QtMvvm {
 
 class ServiceRegistryPrivate;
 //! A singleton to prepare services for dependency injection and to access them
-class Q_MVVMCORE_EXPORT ServiceRegistry
+class Q_MVVMCORE_EXPORT ServiceRegistry //MAJOR make a QObject for invokable methods and Q_ENUM
 {
 public:
 	enum DestructionScope {