Fix LiriLocalDevice

lirios · Dec 3, 2023 · 7fdecfd · 7fdecfd
1 parent 0ba9dbd
commit 7fdecfd
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 124 deletions.
diff --git a/src/imports/device/plugin.cpp b/src/imports/device/plugin.cpp
diff --git a/src/imports/device/plugins.qmltypes b/src/imports/device/plugins.qmltypes
diff --git a/src/imports/device/qmldir b/src/imports/device/qmldir
diff --git a/src/localdevice/CMakeLists.txt b/src/localdevice/CMakeLists.txt
@@ -13,10 +13,11 @@ liri_add_module(LocalDevice
     PUBLIC_LIBRARIES
         Qt6::Core
         Qt6::DBus
-        Qt6::QmlIntegration
+        Qt6::Qml
     PKGCONFIG_DEPENDENCIES
         Qt6Core
         Qt6DBus
+        Qt6Qml
 )
 
 liri_finalize_module(LocalDevice)
diff --git a/src/localdevice/localdevice.cpp b/src/localdevice/localdevice.cpp
@@ -560,4 +560,12 @@ void LocalDevice::hybridSleep()
         d->upower->hybridSleep();
 }
 
+LocalDevice *LocalDevice::create(QQmlEngine *engine, QJSEngine *jsEngine)
+{
+    Q_UNUSED(engine);
+    Q_UNUSED(jsEngine);
+
+    return new LocalDevice();
+}
+
 } // namespace Liri
diff --git a/src/localdevice/localdevice.h b/src/localdevice/localdevice.h
@@ -5,7 +5,7 @@
 #pragma once
 
 #include <QObject>
-#include <QtQmlIntegration>
+#include <QQmlEngine>
 
 #include <LiriLocalDevice/OsRelease>
 
@@ -34,6 +34,7 @@ class LIRILOCALDEVICE_EXPORT LocalDevice : public QObject
     Q_PROPERTY(bool canHybridSleep READ canHybridSleep NOTIFY canHybridSleepdChanged)
     Q_PROPERTY(OsRelease *osRelease READ osRelease CONSTANT)
     QML_ELEMENT
+    QML_SINGLETON
 public:
     enum Chassis {
         UnknownChassis = 0,
@@ -80,6 +81,8 @@ class LIRILOCALDEVICE_EXPORT LocalDevice : public QObject
     bool canHibernate() const;
     bool canHybridSleep() const;
 
+    static LocalDevice *create(QQmlEngine *engine, QJSEngine *jsEngine);
+
 Q_SIGNALS:
     void powerSourceChanged();
     void lidPresentChanged();

diff --git a/src/localdevice/osrelease.h b/src/localdevice/osrelease.h
@@ -39,6 +39,7 @@ class LIRILOCALDEVICE_EXPORT OsRelease : public QObject
     Q_PROPERTY(QString variantId READ variantId NOTIFY variantIdChanged)
     Q_PROPERTY(QString logoIconName READ logoIconName NOTIFY logoIconNameChanged)
     QML_ELEMENT
+    QML_UNCREATABLE("Cannot create OsRelease")
 public:
     explicit OsRelease(QObject *parent = nullptr);
     ~OsRelease();