Add qt6-qtlottie as a build dep

Author: strseb

.github/workflows/wasm_tests.yaml

@@ -48,7 +48,7 @@ jobs:
         shell: bash
         run: |
           # Qt for wasm needs the desktop linux installation
-          python -m aqt install-qt -O /opt linux desktop $QTVERSION linux_gcc_64 -m qtshadertools
+          python -m aqt install-qt -O /opt linux desktop $QTVERSION linux_gcc_64 -m qtshadertools qtlottie
           python -m aqt install-qt -O /opt all_os wasm $QTVERSION wasm_singlethread -m qtwebsockets qtshadertools
 
       - name: Setup emsdk

linux/debian/control

@@ -53,6 +53,7 @@ Build-Depends: debhelper (>= 13),
                qt6-declarative-dev (>=6.2.0~),
                qt6-declarative-private-dev (>=6.2.0~),
                qt6-declarative-dev-tools (>=6.2.0~),
+               qt6-lottie-dev (>=6.2.0~),
                qt6-l10n-tools (>=6.2.0~),
                qt6-tools-dev-tools (>=6.2.0~),
                qt6-websockets-dev (>=6.2.0~) | libqt6websockets6-dev (>=6.2.0~)
@@ -98,6 +99,7 @@ Depends: wireguard (>=1.0.20200319),
          qml6-module-qtquick-templates (>=6.2.0~),
          qml6-module-qtquick-window (>=6.2.0~),
          qml6-module-qtquick-shapes (>=6.2.0~),
+         qml6-module-qt-labs-lottieqt (>=6.2.0~),
          qml6-module-qtqml (>=6.2.0~),
          qml6-module-qtqml-models (>=6.2.0~),
          qml6-module-qtqml-workerscript (>=6.2.0~),

linux/mozillavpn.spec

@@ -14,6 +14,7 @@ Requires:  qt6-qtbase >= 6.0
 Requires:  qt6-qtnetworkauth >= 6.0
 Requires:  qt6-qtquickcontrols2 >= 6.0
 Requires:  qt6-qtsvg >= 6.0
+Requires:  qt6-qtlottie >= 6.0
 Requires:  wireguard-tools
 
 BuildRequires: cmake
@@ -29,6 +30,7 @@ BuildRequires: qt6-qtbase-devel >= 6.0
 BuildRequires: qt6-qtbase-private-devel >= 6.0
 BuildRequires: qt6-qtnetworkauth-devel >= 6.0
 BuildRequires: qt6-qtdeclarative-devel >= 6.0
+BuildRequires: qt6-qtlottie-devel >= 6.0
 BuildRequires: qt6-qtsvg-devel >= 6.0
 BuildRequires: qt6-qttools-devel >= 6.0
 BuildRequires: qt6-qtwebsockets-devel >= 6.0

scripts/android/conda_setup_qt.sh

@@ -42,8 +42,8 @@ fi
 export QT_DIR=$CONDA_PREFIX/Qt
 
 # QT_Host Tools
-echo "aqt install-qt --outputdir $QT_DIR $HOST_TARGET"
-python -m aqt install-qt --outputdir $QT_DIR $HOST_TARGET
+echo "aqt install-qt --outputdir $QT_DIR $HOST_TARGET -m qtlottie"
+python -m aqt install-qt --outputdir $QT_DIR $HOST_TARGET -m qtlottie
 for QT_HOST_DIR in $(find ${QT_DIR} -type d -name "${HOST_FOLDER_NAME}"); do
     find ${QT_HOST_DIR} -type f -name 'lib*.a' -delete
 done

scripts/utils/qt6_compile.sh

@@ -204,7 +204,6 @@ mkdir -p $BUILDDIR
   -skip qtdatavis3d  \
   -skip qtgrpc  \
   -skip qtremoteobjects  \
-  -skip qtlottie  \
   -skip qtmqtt  \
   -skip qtopcua  \
   -skip qtpositioning  \

src/cmake/lottietoqml.cmake

@@ -30,7 +30,8 @@ function(mz_target_qml_from_lottie target)
 
         add_custom_command(
             OUTPUT "${result}"
-            COMMAND Qt6::lottietoqml -c -p "${file_absolute}" "${result}"
+            COMMAND ${CMAKE_COMMAND} -E env QT_QPA_PLATFORM=offscreen
+                    $<TARGET_FILE:Qt6::lottietoqml> -c -p "${file_absolute}" "${result}"
             DEPENDS "${file_absolute}" Qt6::lottietoqml
             VERBATIM
         )

src/ui/CMakeLists.txt

@@ -165,34 +165,28 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
 endif()
 
 
-# The onboarding animations are plain QML generated from the Lottie JSON. When
-# the Qt lottietoqml generator is available (Qt 6.11+) we regenerate it at build
-# time; otherwise we fall back to the checked-in copies under animations/. Either
-# way no Lottie runtime is bundled.
+# The onboarding animations are plain QML generated from the Lottie JSON at build
+# time by the Qt6::lottietoqml tool. No Lottie runtime is bundled.
 include(${CMAKE_SOURCE_DIR}/src/cmake/lottietoqml.cmake)
 find_package(Qt6 QUIET COMPONENTS LottieTools)
-if(TARGET Qt6::lottietoqml)
-    message(STATUS "Onboarding animations: regenerating QML from Lottie JSON with Qt6::lottietoqml")
-    mz_target_qml_from_lottie(
-        mozillavpn-ui
-        FILES
-           resources/animations/globe_animation.json
-           resources/animations/lock_animation.json
-           resources/animations/vpnactive_animation.json
-           resources/animations/vpnlogo-drop_animation.json
-        OUTPUTS
-           animations/GlobeAnimation.qml
-           animations/LockAnimation.qml
-           animations/VpnActiveAnimation.qml
-           animations/VpnLogoDropAnimation.qml
-    )
-else()
-    message(STATUS "Onboarding animations: Qt6::lottietoqml not found, using checked-in QML under src/ui/animations/")
-    qt_target_qml_sources(mozillavpn-ui
-        QML_FILES
-           animations/GlobeAnimation.qml
-           animations/LockAnimation.qml
-           animations/VpnActiveAnimation.qml
-           animations/VpnLogoDropAnimation.qml
-    )
-endif()
+if(NOT TARGET Qt6::lottietoqml)
+    message(FATAL_ERROR
+        "Qt6::lottietoqml not found. It is required to generate the onboarding "
+        "animations from Lottie JSON. Install the Qt Lottie tools in the toolchain "
+        "(note: finding the LottieTools package is not enough - the generator tool "
+        "ships separately).")
+endif()
+message(STATUS "Onboarding animations: regenerating QML from Lottie JSON with Qt6::lottietoqml")
+mz_target_qml_from_lottie(
+    mozillavpn-ui
+    FILES
+       resources/animations/globe_animation.json
+       resources/animations/lock_animation.json
+       resources/animations/vpnactive_animation.json
+       resources/animations/vpnlogo-drop_animation.json
+    OUTPUTS
+       animations/GlobeAnimation.qml
+       animations/LockAnimation.qml
+       animations/VpnActiveAnimation.qml
+       animations/VpnLogoDropAnimation.qml
+)