From d0edc296360e7653a4c8b672cfb136581c4a10f0 Mon Sep 17 00:00:00 2001 From: jan Iversen Date: Tue, 4 Sep 2018 11:18:43 +0200 Subject: core,tests: change qml register function In order to address the C++ object directy in qml, a different registration is needed. qmlRegisterType, registers the C++ class, allowing qml code to inherit from it and make qml objects. This is needed for graphical elemnets like profile and map setContentProperty, registers the C++ object, thus allowing signals to be catched. Signed-off-by: Jan Iversen --- core/settings/qPref.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'core/settings/qPref.h') diff --git a/core/settings/qPref.h b/core/settings/qPref.h index f62a5eec4..e42e2b96b 100644 --- a/core/settings/qPref.h +++ b/core/settings/qPref.h @@ -5,6 +5,7 @@ #include "ssrf-version.h" #include +#include #include "qPrefCloudStorage.h" #include "qPrefDisplay.h" @@ -23,7 +24,6 @@ class qPref : public QObject { Q_OBJECT - Q_ENUMS(cloud_status); Q_PROPERTY(QString canonical_version READ canonical_version); Q_PROPERTY(QString mobile_version READ mobile_version); @@ -36,7 +36,7 @@ public: static void sync() { loadSync(true); } // Register QML - void registerQML(); + void registerQML(QQmlEngine *engine); public: enum cloud_status { @@ -46,6 +46,7 @@ public: CS_VERIFIED, CS_NOCLOUD }; + Q_ENUM(cloud_status); static const QString canonical_version() { return QString(CANONICAL_VERSION_STRING); } static const QString mobile_version() { return QString(MOBILE_VERSION_STRING); } -- cgit v1.2.3-70-g09d2