Generate everything org.asteroid.utils related via CMake

Author: JamiKettunen

src/utils/CMakeLists.txt

@@ -1,22 +1,33 @@
 set(SRC
-	src/utils_plugin.cpp
 	src/deviceinfo.cpp
 	src/fileinfo.cpp
 	src/bluetoothstatus.cpp)
 set(HEADERS
-	src/utils_plugin.h
 	src/deviceinfo.h
 	src/fileinfo.h
 	src/bluetoothstatus.h)
 
-add_library(asteroidutilsplugin ${SRC} ${HEADERS})
+# TODO: ensure FileInfo 1.0 (singleton) & BluetoothStatus 1.0 (normal) QML classes work
+qt_add_qml_module(asteroidutilsplugin
+	URI org.asteroid.utils
+	VERSION 1.0
+	PLUGIN_TARGET asteroidutilsplugin
+	#NO_PLUGIN_OPTIONAL
+	SOURCES
+		${SRC} ${HEADERS}
+)
+
+target_include_directories(asteroidutilsplugin PRIVATE src)
 
 target_link_libraries(asteroidutilsplugin
-	Qt::DBus
-	Qt::Qml
-	Qt::Quick)
+	#PUBLIC
+	#	Qt::Qml
+	#	Qt::Quick
+	PRIVATE
+		Qt::DBus # bluetoothstatus
+)
 
 install(TARGETS asteroidutilsplugin
 	DESTINATION ${INSTALL_QML_IMPORT_DIR}/org/asteroid/utils)
-install(FILES qmldir
-	DESTINATION ${INSTALL_QML_IMPORT_DIR}/org/asteroid/utils)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qmldir
+    DESTINATION ${INSTALL_QML_IMPORT_DIR}/org/asteroid/utils)

src/utils/qmldir

@@ -23,13 +23,15 @@
 #include <QDBusObjectPath>
 #include <QDBusConnection>
 #include <QDBusServiceWatcher>
+#include <QtQml>
 
 typedef QMap<QString, QMap<QString, QVariant>> InterfaceList;
 Q_DECLARE_METATYPE(InterfaceList)
 
 class BluetoothStatus : public QObject
 {
     Q_OBJECT
+    QML_ELEMENT
     Q_PROPERTY(bool powered READ getPowered WRITE setPowered NOTIFY poweredChanged)
     Q_PROPERTY(bool connected READ getConnected NOTIFY connectedChanged)
 

src/utils/src/bluetoothstatus.h

@@ -26,6 +26,8 @@
 class DeviceInfo : public QObject
 {
     Q_OBJECT
+    QML_SINGLETON
+    QML_ELEMENT
     Q_DISABLE_COPY(DeviceInfo)
     Q_PROPERTY(bool hasRoundScreen READ hasRoundScreen CONSTANT)
     Q_PROPERTY(double borderGestureWidth READ borderGestureWidth CONSTANT)
@@ -38,11 +40,8 @@ class DeviceInfo : public QObject
     Q_PROPERTY(QString buildID READ buildID CONSTANT)
     DeviceInfo();
 public:
-    static QObject *qmlInstance(QQmlEngine *engine, QJSEngine *scriptEngine)
+    static DeviceInfo *create(QQmlEngine *, QJSEngine *)
     {
-        Q_UNUSED(engine);
-        Q_UNUSED(scriptEngine);
-
         return new DeviceInfo;
     }
     bool hasRoundScreen();

src/utils/src/deviceinfo.h

@@ -25,16 +25,16 @@
 class FileInfo : public QObject
 {
     Q_OBJECT
+    QML_SINGLETON
+    QML_ELEMENT
     Q_DISABLE_COPY(FileInfo)
     FileInfo() {}
 public:
-    static QObject *qmlInstance(QQmlEngine *engine, QJSEngine *scriptEngine)
+    static FileInfo *create(QQmlEngine *, QJSEngine *)
     {
-        Q_UNUSED(engine);
-        Q_UNUSED(scriptEngine);
-
         return new FileInfo;
     }
+    // TODO: FileInfo(QObject *parent = 0); instead?
     Q_INVOKABLE bool exists(const QString fileName);
 };