[phase-02] Reach launcher services through LauncherContext

.github/actions/package/linux/action.yml

@@ -96,11 +96,39 @@ runs:
           )
         fi
 
+        # Qt's own QML modules (QtQuick, QtQuick.Controls, ...) live in
+        # $QT_INSTALL_QML, a directory *sibling to* $QT_PLUGIN_PATH -- the
+        # "$QT_PLUGIN_PATH"/*/*.so glob below never reaches them, so the QML
+        # shell has nothing to import QtQuick from. Deploy only the modules
+        # launcher/qml/ actually imports (found with qmlimportscanner)
+        # rather than the whole Qt QML tree (Quick3D, WebEngine, etc.).
+        qt_root="$(dirname "${QT_PLUGIN_PATH%/}")"
+        QT_QML_PATH="$qt_root/qml"
+        qmlimportscanner_bin="$(find "$qt_root" -name qmlimportscanner -type f | head -1)"
+        if [[ -z "$qmlimportscanner_bin" ]]; then
+          echo "::error::qmlimportscanner not found under $qt_root; cannot determine which Qt QML modules to bundle."
+          exit 1
+        fi
+        mapfile -t qml_modules < <(
+          "$qmlimportscanner_bin" -rootPath launcher/qml -importPath "$QT_QML_PATH" \
+            | grep -o '"relativePath": *"[^"]*"' | sed -E 's/.*"([^"]*)"$/\1/' | sort -u
+        )
+        if [[ ${#qml_modules[@]} -eq 0 ]]; then
+          echo "::error::qmlimportscanner reported no Qt QML modules for launcher/qml"
+          exit 1
+        fi
+        qml_plugin_libs=()
+        for m in "${qml_modules[@]}"; do
+          mkdir -p "$INSTALL_APPIMAGE_DIR/qml/$(dirname "$m")"
+          cp -a "$QT_QML_PATH/$m" "$INSTALL_APPIMAGE_DIR/qml/$m"
+          while IFS= read -r -d '' so; do qml_plugin_libs+=("$so"); done < <(find "$QT_QML_PATH/$m" -maxdepth 1 -name '*.so' -print0)
+        done
+
         sharun lib4bin \
           --hard-links \
           --with-hooks \
           --dst-dir "$INSTALL_APPIMAGE_DIR" \
-          "$INSTALL_APPIMAGE_DIR"/bin/* "$QT_PLUGIN_PATH"/*/*.so "${openssl_libs[@]}"
+          "$INSTALL_APPIMAGE_DIR"/bin/* "$QT_PLUGIN_PATH"/*/*.so "${qml_plugin_libs[@]}" "${openssl_libs[@]}"
 
         cp ~/bin/AppImageUpdate.AppImage "$INSTALL_APPIMAGE_DIR"/bin/
         # FIXME(@YongDo-Hyun): gamemode doesn't seem to be very portable with DBus. Find a way to make it work!
@@ -109,7 +137,11 @@ runs:
         #disable OpenGL and Vulkan launcher features until https://github.com/VHSgunzo/sharun/issues/35
         echo "LAUNCHER_DISABLE_GLVULKAN=1" > "$INSTALL_APPIMAGE_DIR"/.env
         #makes the launcher use portals for file picking
-        echo "QT_QPA_PLATFORMTHEME=xdgdesktopportal" > "$INSTALL_APPIMAGE_DIR"/.env
+        echo "QT_QPA_PLATFORMTHEME=xdgdesktopportal" >> "$INSTALL_APPIMAGE_DIR"/.env
+        #points Qt at the QML modules copied in above (AppDir-relative; $APPDIR
+        #is exported by the AppImage runtime before AppRun/sharun ever runs)
+        echo "QML2_IMPORT_PATH=\$APPDIR/qml" >> "$INSTALL_APPIMAGE_DIR"/.env
+        echo "QML_IMPORT_PATH=\$APPDIR/qml" >> "$INSTALL_APPIMAGE_DIR"/.env
         ln -s org.projecttick.MeshMC.metainfo.xml "$INSTALL_APPIMAGE_DIR"/share/metainfo/org.projecttick.MeshMC.appdata.xml
         ln -s share/applications/org.projecttick.MeshMC.desktop "$INSTALL_APPIMAGE_DIR"
         ln -s share/icons/hicolor/256x256/apps/org.projecttick.MeshMC.png "$INSTALL_APPIMAGE_DIR"
@@ -147,11 +179,37 @@ runs:
           )
         fi
 
+        # See the QML deployment comment in the AppImage step above: Qt's own
+        # QML modules live beside $QT_PLUGIN_PATH, not under it, and the
+        # portable tarball needs them too (launcher/MeshMC.in points Qt at
+        # the copy made here via QML2_IMPORT_PATH/QML_IMPORT_PATH).
+        qt_root="$(dirname "${QT_PLUGIN_PATH%/}")"
+        QT_QML_PATH="$qt_root/qml"
+        qmlimportscanner_bin="$(find "$qt_root" -name qmlimportscanner -type f | head -1)"
+        if [[ -z "$qmlimportscanner_bin" ]]; then
+          echo "::error::qmlimportscanner not found under $qt_root; cannot determine which Qt QML modules to bundle."
+          exit 1
+        fi
+        mapfile -t qml_modules < <(
+          "$qmlimportscanner_bin" -rootPath launcher/qml -importPath "$QT_QML_PATH" \
+            | grep -o '"relativePath": *"[^"]*"' | sed -E 's/.*"([^"]*)"$/\1/' | sort -u
+        )
+        if [[ ${#qml_modules[@]} -eq 0 ]]; then
+          echo "::error::qmlimportscanner reported no Qt QML modules for launcher/qml"
+          exit 1
+        fi
+        qml_plugin_libs=()
+        for m in "${qml_modules[@]}"; do
+          mkdir -p "$INSTALL_PORTABLE_DIR/qml/$(dirname "$m")"
+          cp -a "$QT_QML_PATH/$m" "$INSTALL_PORTABLE_DIR/qml/$m"
+          while IFS= read -r -d '' so; do qml_plugin_libs+=("$so"); done < <(find "$QT_QML_PATH/$m" -maxdepth 1 -name '*.so' -print0)
+        done
+
         sharun lib4bin \
           --with-hooks \
           --hard-links \
           --dst-dir "$INSTALL_PORTABLE_DIR" \
-          "$INSTALL_PORTABLE_DIR"/bin/* "$QT_PLUGIN_PATH"/*/*.so "${openssl_libs[@]}"
+          "$INSTALL_PORTABLE_DIR"/bin/* "$QT_PLUGIN_PATH"/*/*.so "${qml_plugin_libs[@]}" "${openssl_libs[@]}"
 
         # FIXME(@YongDo-Hyun): gamemode doesn't seem to be very portable with DBus. Find a way to make it work!
         find "$INSTALL_PORTABLE_DIR" -name '*gamemode*' -exec rm {} +

.github/actions/setup-dependencies/action.yml

@@ -121,7 +121,12 @@ runs:
       with:
         aqtversion: "==3.1.*"
         version: ${{ inputs.qt-version }}
-        modules: qtimageformats qtnetworkauth
+        # qtquick3d is the optional 3D cat companion's only extra Qt
+        # dependency (see launcher/qml/Cat/CMakeLists.txt); qtshadertools is
+        # listed alongside it because Quick3D bakes its shader variants
+        # through it at runtime, not only at build time, so it has to be
+        # present even though nothing here compiles a shader directly.
+        modules: qtimageformats qtnetworkauth qtquick3d qtshadertools
         cache: ${{ inputs.build-type == 'Debug' }}
 
     - name: Setup bundled OpenSSL

.github/actions/setup-dependencies/windows/action.yml

@@ -56,6 +56,9 @@ runs:
           cmake:p
           ninja:p
           qt${{ inputs.qt-major }}-base:p
+          qt${{ inputs.qt-major }}-declarative:p
+          qt${{ inputs.qt-major }}-quick3d:p
+          qt${{ inputs.qt-major }}-shadertools:p
           qt${{ inputs.qt-major }}-svg:p
           qt${{ inputs.qt-major }}-imageformats:p
           qt${{ inputs.qt-major }}-networkauth:p

CMakeLists.txt

@@ -154,6 +154,11 @@ set(QT_VERSION_MAJOR 6)
 # Still a cache variable so that scripts and CI invocations that pass
 # -DMeshMC_QT_VERSION_MAJOR=5 fail loudly instead of quietly building Qt 6 when
 # they asked for something else.
+# The QML user interface is always built; this only picks which interface the
+# launcher opens by default. MESHMC_QML_UI=1 or =0 in the environment overrides
+# it at run time.
+option(MeshMC_QML_UI "Open the QML user interface instead of the QtWidgets one by default (preview)" OFF)
+
 set(MeshMC_QT_VERSION_MAJOR "6" CACHE STRING "Major Qt version to build against (6 only)")
 set_property(CACHE MeshMC_QT_VERSION_MAJOR PROPERTY STRINGS "6")
 
@@ -210,6 +215,21 @@ endif()
 message(STATUS "Building against Qt ${_projt_qt_version} (major version ${QT_VERSION_MAJOR})")
 unset(_projt_qt_version)
 
+# Qt Quick 3D, for the optional roaming cat companion (launcher/qml/Cat/) --
+# never added to MeshMC_QT_COMPONENTS above: unlike everything there, the
+# 6.4 floor must keep building without it, so it is looked for but not
+# required. MeshMC_ENABLE_CAT defaults to whatever was found, and is the one
+# switch that decides whether launcher/qml/CMakeLists.txt descends into
+# Cat/ at all; turning it OFF by hand skips the cat even when Quick3D is
+# present, but it can never turn ON what was not found.
+find_package(Qt${QT_VERSION_MAJOR} OPTIONAL_COMPONENTS Quick3D)
+option(MeshMC_ENABLE_CAT "Build the roaming 3D cat companion (needs Qt Quick 3D)" ${Qt${QT_VERSION_MAJOR}Quick3D_FOUND})
+if(MeshMC_ENABLE_CAT AND NOT Qt${QT_VERSION_MAJOR}Quick3D_FOUND)
+    message(WARNING "MeshMC_ENABLE_CAT is ON but Qt Quick3D was not found; building without the cat.")
+    set(MeshMC_ENABLE_CAT OFF)
+endif()
+message(STATUS "Cat companion (Qt Quick3D): ${MeshMC_ENABLE_CAT}")
+
 if(UNIX)
     find_package(PkgConfig)
     if(PkgConfig_FOUND)
@@ -226,6 +246,11 @@ include(QMakeQuery)
 QUERY_QMAKE(QT_INSTALL_PLUGINS QT_PLUGINS_DIR)
 QUERY_QMAKE(QT_INSTALL_LIBS QT_LIBS_DIR)
 QUERY_QMAKE(QT_INSTALL_LIBEXECS QT_LIBEXECS_DIR)
+# Where Qt's own QML modules (QtQuick, QtQuick.Controls, ...) live in the Qt
+# installation used for the build. Needed at packaging time: our own QML
+# modules are compiled into the launcher, but Qt's are not, and have to be
+# deployed and pointed at explicitly (see launcher/CMakeLists.txt).
+QUERY_QMAKE(QT_INSTALL_QML QT_QML_DIR)
 
 # Map missing multi-config configurations to available ones.
 # Monorepo libraries are built with single-config (Ninja), but MeshMC uses
@@ -509,6 +534,18 @@ if(UNIX AND APPLE)
     set(PLUGIN_DEST_DIR "${MeshMC_Name}.app/Contents/MacOS")
     set(RESOURCES_DEST_DIR "${MeshMC_Name}.app/Contents/Resources")
     set(JARS_DEST_DIR "${MeshMC_Name}.app/Contents/Resources/jars")
+    # Where Qt's own QML modules land inside the bundle. Contents/Resources
+    # (rather than next to PLUGIN_DEST_DIR in Contents/MacOS) so it matches
+    # what qt.conf's QmlImports key below is written relative to.
+    set(QML_DEST_DIR "${MeshMC_Name}.app/Contents/Resources/qml")
+    # qt.conf's [Paths] entries are, on macOS, resolved relative to the
+    # bundle's Contents/ directory (verified empirically: a value of
+    # "Foo.app/Contents/MacOS" written into Contents/Resources/qt.conf came
+    # out as Contents/Foo.app/Contents/MacOS, one "Contents/" too many) --
+    # not relative to CMAKE_INSTALL_PREFIX like PLUGIN_DEST_DIR/QML_DEST_DIR
+    # (used for actual install() DESTINATION arguments) have to be.
+    set(QT_CONF_PLUGINS_DEST "MacOS")
+    set(QT_CONF_QML_DEST "Resources/qml")
     set(BUNDLE_DEST_DIR ".")
     set(MMCO_MODULES_DEST_DIR
         "${MeshMC_Name}.app/Contents/Resources/mmcmodules")
@@ -622,6 +659,15 @@ elseif(WIN32)
     set(PLUGIN_DEST_DIR ".")
     set(FRAMEWORK_DEST_DIR ".")
     set(RESOURCES_DEST_DIR ".")
+    # windeployqt's own default destination for the Qt QML modules it deploys
+    # (see the --qmldir call in launcher/CMakeLists.txt); qt.conf's
+    # QmlImports key below points here too.
+    set(QML_DEST_DIR "qml")
+    # On Windows qt.conf's [Paths] entries are relative to qt.conf's own
+    # directory (RESOURCES_DEST_DIR, "."), same as PLUGIN_DEST_DIR/QML_DEST_DIR
+    # already are -- no bundle-style adjustment needed here.
+    set(QT_CONF_PLUGINS_DEST "${PLUGIN_DEST_DIR}")
+    set(QT_CONF_QML_DEST "${QML_DEST_DIR}")
     set(JARS_DEST_DIR "jars")
     # Windows keeps the flat layout it has always used: .mmco files
     # next to meshmc.exe under <install>/mmcmodules. Variable exists

branding/win_install.nsi.in

@@ -384,6 +384,7 @@ Section "@MeshMC_DisplayName@"
   File /r "imageformats"
   File /r "jars"
   File /r "platforms"
+  File /r "qml"
   File /r "styles"
   File /nonfatal /r "tls"
 
@@ -485,6 +486,7 @@ Section "Uninstall"
   RMDir /r $INSTDIR\imageformats
   RMDir /r $INSTDIR\jars
   RMDir /r $INSTDIR\platforms
+  RMDir /r $INSTDIR\qml
   RMDir /r $INSTDIR\styles
   RMDir /r $INSTDIR\tls