Merge branch 'main' into feat/settings-revamp

Plugins/ZShell/CMakeLists.txt

@@ -9,7 +9,7 @@ pkg_check_modules(Cava IMPORTED_TARGET libcava QUIET)
 pkg_check_modules(GLIB REQUIRED glib-2.0 gobject-2.0 gio-2.0)
 
 if(NOT Cava_FOUND)
-    pkg_check_modules(Cava IMPORTED_TARGET cava REQUIRED)
+	pkg_check_modules(Cava IMPORTED_TARGET cava REQUIRED)
 endif()
 
 if(NOT TARGET Sensors::Sensors)
@@ -24,48 +24,50 @@ set(QT_QML_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/qml")
 qt_standard_project_setup(REQUIRES 6.9)
 
 function(qml_module arg_TARGET)
-    cmake_parse_arguments(PARSE_ARGV 1 arg "" "URI" "SOURCES;LIBRARIES")
-    qt_add_qml_module(${arg_TARGET}
-        URI ${arg_URI}
-        VERSION 1.0
-        SOURCES ${arg_SOURCES}
-    )
+	cmake_parse_arguments(PARSE_ARGV 1 arg "" "URI" "SOURCES;LIBRARIES")
+	qt_add_qml_module(${arg_TARGET}
+		URI ${arg_URI}
+		VERSION 1.0
+		SOURCES ${arg_SOURCES}
+	)
 
-    qt_query_qml_module(${arg_TARGET}
-        URI module_uri
-        VERSION module_version
-        PLUGIN_TARGET module_plugin_target
-        TARGET_PATH module_target_path
-        QMLDIR module_qmldir
-        TYPEINFO module_typeinfo
-    )
+	qt_query_qml_module(${arg_TARGET}
+		URI module_uri
+		VERSION module_version
+		PLUGIN_TARGET module_plugin_target
+		TARGET_PATH module_target_path
+		QMLDIR module_qmldir
+		TYPEINFO module_typeinfo
+	)
 	set(module_dir "${INSTALL_QMLDIR}/${module_target_path}")
-    install(TARGETS ${arg_TARGET} LIBRARY DESTINATION "${module_dir}" RUNTIME DESTINATION "${module_dir}")
-    install(TARGETS "${module_plugin_target}" LIBRARY DESTINATION "${module_dir}" RUNTIME DESTINATION "${module_dir}")
-    install(FILES "${module_qmldir}" DESTINATION "${module_dir}")
-    install(FILES "${module_typeinfo}" DESTINATION "${module_dir}")
-    target_link_libraries(${arg_TARGET} PRIVATE Qt::Core Qt::Qml ${arg_LIBRARIES})
+	install(TARGETS ${arg_TARGET} LIBRARY DESTINATION "${module_dir}" RUNTIME DESTINATION "${module_dir}")
+	install(TARGETS "${module_plugin_target}" LIBRARY DESTINATION "${module_dir}" RUNTIME DESTINATION "${module_dir}")
+	install(FILES "${module_qmldir}" DESTINATION "${module_dir}")
+	install(FILES "${module_typeinfo}" DESTINATION "${module_dir}")
+	target_link_libraries(${arg_TARGET} PRIVATE Qt::Core Qt::Qml ${arg_LIBRARIES})
 endfunction()
 
 qml_module(ZShell
-    URI ZShell
-    SOURCES
-        writefile.hpp writefile.cpp
-        appdb.hpp appdb.cpp
-        imageanalyser.hpp imageanalyser.cpp
+	URI ZShell
+	SOURCES
+		writefile.hpp writefile.cpp
+		appdb.hpp appdb.cpp
+		imageanalyser.hpp imageanalyser.cpp
 		requests.hpp requests.cpp
 		toaster.hpp toaster.cpp
 		qalculator.hpp qalculator.cpp
 		zutils.hpp zutils.cpp
-    LIBRARIES
-        Qt::Gui
-        Qt::Quick
-        Qt::Concurrent
-        Qt::Sql
+	LIBRARIES
+		Qt::Gui
+		Qt::Quick
+		Qt::Concurrent
+		Qt::Sql
 		Qt::DBus
 		PkgConfig::Qalculate
 )
 
+target_compile_definitions(ZShell PRIVATE ZSHELL_VERSION="${VERSION}")
+
 add_subdirectory(Models)
 add_subdirectory(Internal)
 add_subdirectory(Services)

Plugins/ZShell/zutils.cpp

@@ -3,9 +3,11 @@
 #include <QtConcurrent/qtconcurrentrun.h>
 #include <QtQuick/qquickitemgrabresult.h>
 #include <QtQuick/qquickwindow.h>
+#include <qcontainerfwd.h>
 #include <qdir.h>
 #include <qfileinfo.h>
 #include <qfuturewatcher.h>
+#include <qjsprimitivevalue.h>
 #include <qloggingcategory.h>
 #include <qqmlengine.h>
 
@@ -142,4 +144,16 @@ qreal ZUtils::clamp(qreal value, qreal min, qreal max) {
 	return qBound(min, value, max);
 }
 
+#ifndef ZSHELL_VERSION
+#define ZSHELL_VERSION ""
+#endif
+
+QString ZUtils::version() const {
+	return QStringLiteral(ZSHELL_VERSION);
+}
+
+QString ZUtils::qtVersion() const {
+	return QStringLiteral(QT_VERSION_STR);
+}
+
 } // namespace ZShell

Plugins/ZShell/zutils.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <QtQuick/qquickitem.h>
+#include <qcontainerfwd.h>
 #include <qobject.h>
 #include <qqmlintegration.h>
 
@@ -26,6 +27,9 @@ Q_INVOKABLE static bool deleteFile(const QUrl& path);
 Q_INVOKABLE static QString toLocalFile(const QUrl& url);
 
 Q_INVOKABLE static qreal clamp(qreal value, qreal min, qreal max);
+
+[[nodiscard]] QString version() const;
+[[nodiscard]] QString qtVersion() const;
 };
 
 } // namespace ZShell