Switch to qt_add_qml_module (requires newer cmake)

Author: slipher

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.18)
+cmake_minimum_required(VERSION 3.21)
 
 project(updater LANGUAGES CXX)
 
@@ -7,17 +7,14 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(CMAKE_AUTORCC ON)
 
-# Allow building with old CMake
-set(QT_FORCE_MIN_CMAKE_VERSION_FOR_USING_QT 3.18)
-
-# Silence warning with CMake < 3.19
-set(QT_QML_GENERATE_AOTSTATS OFF)
-
 set(ARIA2_LIBS "${CMAKE_CURRENT_SOURCE_DIR}/aria2/src/.libs/libaria2.a" CACHE STRING "aria2 libraries")
 set(ARIA2_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/aria2/include" CACHE STRING "aria2 include directory")
 
 find_package(Qt6 REQUIRED COMPONENTS Core Qml Quick QuickControls2 QuickDialogs2   Network  Svg Gui Widgets          )
 
+# Actually only used by Fluid and Quazip, not us. HACK: prevent warning spam
+find_package(Qt6 COMPONENTS Core5Compat)
+
 qt_standard_project_setup(REQUIRES 6.8)
 
 option(FLUID_WITH_GALLERY "" OFF)
@@ -42,6 +39,16 @@ set(SOURCES
     splashcontroller.cpp splashcontroller.h
     system.h
 )
+set(QML_SOURCES
+    DownloadInfo.qml
+    main.qml
+    News.qml
+    NewsCard.qml
+    Settings.qml
+    splash.qml
+    UpdateFailed.qml
+    utils.js
+)
 
 if(APPLE)
     list(APPEND SOURCES osx.cpp)
@@ -51,23 +58,30 @@ else()
     list(APPEND SOURCES linux.cpp)
 endif()
 
-qt_add_executable(updater MANUAL_FINALIZATION
+qt_add_executable(updater
     ${SOURCES}
     qml.qrc
 )
 
-
-# target_compile_definitions(updater PRIVATE QUAZIP_STATIC )
+qt_add_qml_module(updater
+    URI UnvUpdater
+    QML_FILES ${QML_SOURCES}
+    RESOURCE_PREFIX "/"
+)
 
 target_link_libraries(updater PRIVATE
     Qt6::Network
     Qt6::Widgets
+    QuaZip::QuaZip
+    Fluid
+    ${ARIA2_LIBS}
 )
 
-target_link_libraries(updater INTERFACE
+target_link_libraries(updater PRIVATE
     Qt6::Qml
-    Qt6::QuickDialogs2
     Qt6::Quick
+    Qt6::QuickControls2
+    Qt6::QuickDialogs2
 )
 
 
@@ -86,13 +100,6 @@ elseif(UNIX)
     )
 endif()
 
-
-
-target_link_libraries(updater PUBLIC
-    QuaZip::QuaZip
-    Fluid
-)
-
 # Turn on warning errors since the warnings are hard to see in Docker
 if(NOT APPLE)
     target_compile_options(updater PRIVATE -Werror)
@@ -113,10 +120,3 @@ if(APPLE)
 endif()
 
 
-qt_finalize_target(updater)
-
-target_link_libraries(updater PUBLIC
-    Qt6::Qml
-    Qt6::Quick
-)
-

News.qml

@@ -63,7 +63,7 @@ Item {
                     }
                 }
 
-                var component = Qt.createComponent("qrc:/NewsCard.qml");
+                var component = Qt.createComponent("qrc:/UnvUpdater/NewsCard.qml");
 
                 for (var i = 0; i < newsObj['posts'].length; ++i) {
                     var object = component.createObject(swipe);

build-qt.sh

@@ -35,7 +35,7 @@ WORK_DIR="${PWD}"
 SCRIPT_DIR=$(dirname "$0")
 INSTALL_DIR="${WORK_DIR}/qt"
 
-common_options_cmake='-DQT_FORCE_MIN_CMAKE_VERSION_FOR_BUILDING_QT=3.18 -DQT_GENERATE_SBOM=OFF -DQT_FEATURE_accessibility=OFF'
+common_options_cmake='-DQT_GENERATE_SBOM=OFF -DQT_FEATURE_accessibility=OFF'
 options_qtbase="-opensource -confirm-license -release -optimize-size -no-shared -static --c++std=17 -disable-deprecated-up-to 0x060800 -qpa xcb -nomake tests -nomake examples -no-gif -no-icu -no-glib -opengl desktop -no-eglfs -no-opengles3 -no-egl -xkbcommon -dbus-runtime -qt-freetype -qt-pcre -qt-harfbuzz -qt-libpng -qt-libjpeg -system-zlib -openssl-linked -prefix ${INSTALL_DIR} -- -DFEATURE_xcb=1 -DFEATURE_sql=OFF -DFEATURE_printsupport=OFF -DFEATURE_xml=OFF -DFEATURE_testlib=OFF -DFEATURE_qmake=OFF -DFEATURE_style_fusion=OFF -DFEATURE_style_stylesheet=OFF -DFEATURE_androiddeployqt=OFF -DFEATURE_cborstreamwriter=OFF -DFEATURE_columnview=OFF -DFEATURE_commandlinkbutton=OFF -DFEATURE_concatenatetablesproxy=OFF -DFEATURE_concurrent=OFF -DFEATURE_completer=OFF -DFEATURE_contextmenu=OFF -DFEATURE_cssparser=OFF -DFEATURE_datawidgetmapper=OFF -DFEATURE_datetimeedit=OFF -DFEATURE_datetimXXeparser=OFF -DFEATURE_dial=OFF -DFEATURE_dialogbuttonbox=ON -DFEATURE_dockwidget=OFF -DFEATURE_draganddrop=OFF -DFEATURE_dtls=OFF -DFEATURE_easingcurve=OFF -DFEATURE_filedialog=OFF -DFEATURE_filesystemmodel=OFF -DFEATURE_filesystemwatcher=OFF -DFEATURE_fontcombobox=OFF -DFEATURE_fontdialog=OFF -DFEATURE_formlayout=OFF -DFEATURE_fscompleter=OFF -DFEATURE_future=OFF -DFEATURE_gc_binaries=OFF -DFEATURE_gestures=OFF -DFEATURE_graphicsview=OFF -DFEATURE_groupbox=OFF -DFEATURE_hijricalendar=OFF -DFEATURE_identityproxymodel=OFF -DFEATURE_im=OFF -DFEATURE_imageformat_bmp=OFF -DFEATURE_imageformat_jpeg=ON -DFEATURE_imageformat_png=ON -DFEATURE_imageformat_ppm=OFF -DFEATURE_imageformat_xbm=OFF -DFEATURE_imageformat_xpm=OFF -DFEATURE_imageformatplugin=OFF -DFEATURE_imageio_text_loading=OFF -DFEATURE_inputdialog=OFF -DFEATURE_islamiccivilcalendar=OFF -DFEATURE_itemmodel=OFF -DFEATURE_itemviews=OFF -DFEATURE_jalalicalendar=OFF -DFEATURE_keysequenceedit=OFF -DFEATURE_lcdnumber=OFF -DFEATURE_library=OFF -DFEATURE_lineedit=OFF -DFEATURE_listview=OFF -DFEATURE_listwidget=OFF -DFEATURE_localserver=OFF -DFEATURE_mdiarea=OFF -DFEATURE_menu=OFF -DFEATURE_menubar=OFF -DFEATURE_messagebox=ON -DFEATURE_mimetype=OFF -DFEATURE_mimetype_database=OFF -DFEATURE_movie=OFF -DFEATURE_networkdiskcache=OFF -DFEATURE_opengl_desktop=ON -DFEATURE_pdf=OFF -DFEATURE_picture=OFF -DFEATURE_progressbar=OFF -DFEATURE_proxymodel=OFF -DFEATURE_publicsuffix_qt=OFF -DFEATURE_publicsuffix_system=OFF -DFEATURE_pushbutton=ON -DFEATURE_radiobutton=OFF -DFEATURE_rubberband=OFF -DFEATURE_scrollarea=OFF -DFEATURE_scrollbar=OFF -DFEATURE_scroller=OFF -DFEATURE_sessionmanager=OFF -DFEATURE_settings=ON -DFEATURE_shortcut=OFF -DFEATURE_sizegrip=OFF -DFEATURE_slider=OFF -DFEATURE_socks5=OFF -DFEATURE_sortfilterproxymodel=OFF -DFEATURE_spinbox=OFF -DFEATURE_splitter=OFF -DFEATURE_stackedwidget=OFF -DFEATURE_standarditemmodel=OFF -DFEATURE_statusbar=OFF -DFEATURE_statustip=OFF -DFEATURE_stringlistmodel=OFF -DFEATURE_syntaxhighlighter=OFF -DFEATURE_systemtrayicon=OFF -DFEATURE_tabbar=OFF -DFEATURE_tabletevent=OFF -DFEATURE_tableview=OFF -DFEATURE_tabwidget=OFF -DFEATURE_textbrowser=OFF -DFEATURE_teXXXxtdate=OFF -DFEATURE_textedit=OFF -DFEATURE_textmarkdownreader=OFF -DFEATURE_textmarkdownwriter=OFF -DFEATURE_textodfwriter=OFF -DFEATURE_timezonelocale=ON -DFEATURE_toolbar=OFF -DFEATURE_toolbox=OFF -DFEATURE_toolbutton=OFF -DFEATURE_tooltip=OFF -DFEATURE_translation=OFF -DFEATURE_transposeproxymodel=OFF -DFEATURE_treeview=OFF -DFEATURE_treewidget=OFF -DFEATURE_tuiotouch=OFF -DFEATURE_udpsocket=OFF -DFEATURE_undocommand=OFF -DFEATURE_undogroup=OFF -DFEATURE_undostack=OFF -DFEATURE_undoview=OFF -DFEATURE_validator=OFF -DFEATURE_vkgen=OFF -DFEATURE_vnc=OFF -DFEATURE_whatsthis=OFF -DFEATURE_widgettextcontrol=ON -DFEATURE_wizard=OFF -DFEATURE_xmlstream=ON -DQT_FEATURE_label=ON -DQT_BUILD_DOCS=OFF -DQT_BUILD_TOOLS_BY_DEFAULT=OFF -DFEATURE_topleveldomain=OFF"
 options_qt5compat='--'
 options_qtsvg='--'

main.cpp

@@ -218,7 +218,6 @@ int main(int argc, char *argv[])
     void qml_register_types_Fluid();
     qml_register_types_Fluid();
 
-    engine.addImportPath(QLatin1String("qrc:/"));
     auto* context = engine.rootContext();
     context->setContextProperty("updaterSettings", &settings);
     context->setContextProperty("gameLauncher", &gameLauncher);
@@ -231,8 +230,8 @@ int main(int argc, char *argv[])
         "QmlDownloader", 1, 0, "QmlDownloader", "QmlDownloader not constructible");
 
     // LOAD-BEARING POSTER - DO NOT TOUCH
-    qDebug() << engine.singletonInstance<QObject*>("Fluid", "Device");
+    engine.singletonInstance<QObject*>("Fluid", "foo");
 
-    engine.load(QUrl(QLatin1String("qrc:/splash.qml")));
+    engine.load(QUrl(QLatin1String("qrc:/UnvUpdater/splash.qml")));
     return app.exec();
 }

qml.qrc

@@ -1,17 +1,9 @@
 <RCC>
     <qresource prefix="/">
-        <file>main.qml</file>
         <file>qtquickcontrols2.conf</file>
         <file>resources/Roboto-Regular.ttf</file>
         <file>resources/updater.png</file>
-        <file>News.qml</file>
-        <file>NewsCard.qml</file>
-        <file>DownloadInfo.qml</file>
-        <file>UpdateFailed.qml</file>
         <file>resources/splash.png</file>
-        <file>splash.qml</file>
-        <file>Settings.qml</file>
-        <file>utils.js</file>
         <file>resources/unvanquished.png</file>
         <file>resources/background.png</file>
         <file>resources/header.png</file>

splash.qml

@@ -171,7 +171,7 @@ ApplicationWindow {
     Loader {
         id: updaterWindowLoader
         active: false
-        source: "qrc:/main.qml"
+        source: "qrc:/UnvUpdater/main.qml"
     }
 
     ApplicationWindow {