Adopt recommended QML module file layout

This implements the recommended file layout similar to commit
e0633ff8cece18852e5d5ce9eb6f597bad589e60 in quartz, except this time we
try it a bit different to the recommended file structure [0].

We still keep the file structure following the URI of the QML module,
but instead of creating a separate CMakeLists.txt inside the inner most
directory, we create everything from the root CMakeLists.txt.

This still seems to work, but a quick look at the resources with
Gammaray suggests that the source QML path structure is now redundantly
duplicated for all QML resources. This can possibly be fixed by setting
the resource output path for the QML module, but it is not really
important for QML files that only we consume.

Otherwise if we would use a second CMakeLists.txt inside the QML module
path, we would also need to move the entire qt_add_executable() call to
that CMakeLists.txt file as well to avoid weird errors with
"debug_metatypes.json:: Failed to parse JSON: 5 illegal value" [1] [2].

[0] https://doc.qt.io/qt-6/qt-add-qml-module.html#separate-backing-and-plugin-targets
[1] https://bugreports.qt.io/browse/QTBUG-122702
[2] https://bugreports.qt.io/browse/QTBUG-123574

Author: vimpostor

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.31)
 cmake_policy(SET CMP0048 NEW)
 project(blobdrop VERSION 2.1 DESCRIPTION "Drag and drop files directly out of the terminal")
 
@@ -9,8 +9,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
 list(APPEND QT_MODULES Core Qml Quick QuickControls2 DBus Svg)
-find_package(Qt6 6.8 COMPONENTS ${QT_MODULES} REQUIRED)
-qt_standard_project_setup()
+find_package(Qt6 6.9 COMPONENTS ${QT_MODULES} REQUIRED)
+qt_standard_project_setup(REQUIRES ${Qt6_VERSION})
 list(TRANSFORM QT_MODULES PREPEND "Qt6::")
 
 list(APPEND LINK_LIBS ${QT_MODULES})
@@ -25,7 +25,7 @@ if (UNIX AND NOT APPLE)
 endif()
 
 include(FetchContent)
-FetchContent_Declare(quartz GIT_REPOSITORY https://github.com/vimpostor/quartz.git GIT_TAG v0.8)
+FetchContent_Declare(quartz GIT_REPOSITORY https://github.com/vimpostor/quartz.git GIT_TAG v0.9.1)
 FetchContent_MakeAvailable(quartz)
 
 list(APPEND LINK_LIBS ${PKGCONFIG_MODULES})
@@ -35,14 +35,13 @@ add_compile_definitions(BLOBDROP_VERSION="${PROJECT_VERSION}")
 
 file(GLOB_RECURSE SRCS "src/*.cpp")
 file(GLOB_RECURSE HDRS "src/*.hpp")
-file(GLOB_RECURSE QMLS RELATIVE "${CMAKE_SOURCE_DIR}" "src/qml/*.qml")
+file(GLOB_RECURSE QMLS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*.qml")
 
-list(APPEND RSRC "icons.qrc")
-qt_add_resources(RESOURCES ${RSRC})
+qt_add_resources(RESOURCES "${CMAKE_SOURCE_DIR}/icons.qrc")
 
 qt_add_executable(${PROJECT_NAME} ${SRCS} ${RESOURCES})
 
-qt_add_qml_module(${PROJECT_NAME} URI "Blobdrop" VERSION "${PROJECT_VERSION}" NO_RESOURCE_TARGET_PATH QML_FILES ${QMLS} SOURCES "src/Models/path_model.cpp")
+qt_add_qml_module(${PROJECT_NAME} URI "Blobdrop" VERSION "${PROJECT_VERSION}" QML_FILES ${QMLS} SOURCES "src/Models/path_model.cpp")
 set_target_properties(${PROJECT_NAME} PROPERTIES QT_QMLCACHEGEN_ARGUMENTS "--only-bytecode")
 
 target_link_libraries(${PROJECT_NAME} PRIVATE ${LINK_LIBS})

flake.lock

@@ -32,7 +32,6 @@ int main(int argc, char *argv[]) {
 	QGuiApplication::setWindowIcon(QIcon::fromTheme("blobdrop", QIcon(":/blobdrop")));
 
 	QQmlApplicationEngine engine;
-	engine.addImportPath(QStringLiteral(":/"));
 
 	engine.loadFromModule("Blobdrop", "Main");
 	if (engine.rootObjects().isEmpty()) {