Skip to content

Commit 2d37cfd

Browse files
committed
Replace /lottie.js with lottie2QPainter
1 parent 4cae58d commit 2d37cfd

58 files changed

Lines changed: 8843 additions & 2411 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ linux/netfilter/vendor/
3030
.venv
3131
.cache/clangd
3232
__pycache__
33-
lottie.mjs
3433
qml_lint_result.txt
3534
.qmlls.ini
3635
release_notes.txt
@@ -46,8 +45,6 @@ cmake_install.cmake
4645
CMakeCache.txt
4746
CMakeFiles/
4847
compile_commands.json
49-
lottie/lottie_autogen/
50-
lottie/liblottie.a
5148
nebula/nebula_autogen/
5249
nebula/libnebula.a
5350
src/mozillavpn_autogen/

CMakeLists.txt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ set_property(GLOBAL PROPERTY AUTOGEN_TARGETS_FOLDER "Autogen")
138138
set_property(GLOBAL PROPERTY AUTOMOC_TARGETS_FOLDER "Autogen")
139139
set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "Autogen")
140140

141-
find_package(Qt6 6.9 REQUIRED COMPONENTS
141+
find_package(Qt6 6.10 REQUIRED COMPONENTS
142142
Core
143143
Gui
144144
Network
@@ -152,8 +152,8 @@ find_package(Qt6 6.9 REQUIRED COMPONENTS
152152
Xml
153153
Svg
154154
)
155-
if(Qt6_VERSION VERSION_LESS 6.9.0)
156-
message(FATAL_ERROR "Qt 6.9.0 or higher is required. You are building with version ${Qt6_VERSION}")
155+
if(Qt6_VERSION VERSION_LESS 6.10.0)
156+
message(FATAL_ERROR "Qt 6.10.0 or higher is required. You are building with version ${Qt6_VERSION}")
157157
endif()
158158

159159
if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Emscripten" AND
@@ -172,7 +172,6 @@ add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050F00)
172172

173173
# VPN Client build targets
174174
add_subdirectory(src)
175-
add_subdirectory(lottie)
176175
add_subdirectory(nebula)
177176
add_subdirectory(addons)
178177

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ Here are some useful links to start:
6565
## Status
6666

6767
[![Unit Tests](https://github.com/mozilla-mobile/mozilla-vpn-client/actions/workflows/test_unit.yaml/badge.svg)](https://github.com/mozilla-mobile/mozilla-vpn-client/actions/workflows/test_unit.yaml)
68-
[![Lottie Tests](https://github.com/mozilla-mobile/mozilla-vpn-client/actions/workflows/test_lottie.yaml/badge.svg)](https://github.com/mozilla-mobile/mozilla-vpn-client/actions/workflows/test_lottie.yaml)
6968
[![Linters (clang, l10n, colors)](https://github.com/mozilla-mobile/mozilla-vpn-client/actions/workflows/linters.yaml/badge.svg)](https://github.com/mozilla-mobile/mozilla-vpn-client/actions/workflows/linters.yaml)
7069
[![Linux Packages](https://github.com/mozilla-mobile/mozilla-vpn-client/actions/workflows/linux.yaml/badge.svg)](https://github.com/mozilla-mobile/mozilla-vpn-client/actions/workflows/linux.yaml)
7170
[![WebAssembly](https://github.com/mozilla-mobile/mozilla-vpn-client/actions/workflows/wasm.yaml/badge.svg)](https://github.com/mozilla-mobile/mozilla-vpn-client/actions/workflows/wasm.yaml)

lottie/.gitignore

Lines changed: 0 additions & 16 deletions
This file was deleted.

lottie/CMakeLists.txt

Lines changed: 0 additions & 65 deletions
This file was deleted.

lottie/README.md

Lines changed: 0 additions & 32 deletions
This file was deleted.

lottie/bin/lottietest.cpp

Lines changed: 0 additions & 129 deletions
This file was deleted.

lottie/bin/lottietest.qml

Lines changed: 0 additions & 34 deletions
This file was deleted.

lottie/bin/lottietest.qrc

Lines changed: 0 additions & 5 deletions
This file was deleted.

lottie/lib/lottie.cpp

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)