Skip to content

Commit

Permalink
Merge branch 'main' of github.com:Akaflieg-Freiburg/enrouteDependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@kebekus
kebekus committed May 27, 2024
2 parents 0343995 + 441e848 commit 76b344d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion maplibre-native-qt
Submodule maplibre-native-qt updated 45 files
+1 −1 .github/actions/qt5-build/Dockerfile
+5 −11 .github/actions/qt5-build/entrypoint.sh
+17 −31 .github/actions/qt6-build/entrypoint.sh
+67 −66 .github/workflows/Android.yml
+50 −66 .github/workflows/Linux.yml
+43 −95 .github/workflows/Windows.yml
+2 −2 .github/workflows/gh-pages-docs.yml
+20 −51 .github/workflows/iOS.yml
+43 −109 .github/workflows/macOS.yml
+2 −2 .pre-commit-config.yaml
+38 −7 CMakeLists.txt
+17 −0 CMakePresets.json
+66 −0 cmake/presets/Android.json
+277 −0 cmake/presets/Linux.json
+84 −0 cmake/presets/WASM.json
+247 −0 cmake/presets/Windows.json
+35 −0 cmake/presets/common.json
+109 −0 cmake/presets/iOS.json
+246 −0 cmake/presets/macOS.json
+2 −2 docs/Doxyfile
+1 −1 docs/doxygen-awesome-css
+8 −2 docs/header.html
+11 −0 examples/quick/CMakeLists.txt
+59 −0 examples/quick/CMakePresets.json
+1 −1 examples/quick/main.qml
+10 −0 examples/widgets/CMakeLists.txt
+59 −0 examples/widgets/CMakePresets.json
+26 −25 src/core/CMakeLists.txt
+1 −1 src/core/map.cpp
+18 −17 src/location/CMakeLists.txt
+5 −2 src/location/macros.cmake
+24 −24 src/location/plugins/CMakeLists.txt
+4 −4 src/location/plugins/legacy/qml_module.cpp
+9 −9 src/location/plugins/legacy/qml_registration.cpp
+3 −3 src/location/plugins/legacy/qmldir.in
+3 −3 src/location/plugins/qmldir.in
+27 −26 src/widgets/CMakeLists.txt
+2 −2 test/core/CMakeLists.txt
+1 −1 test/qml/CMakeLists.txt
+2 −1 test/qml/qt5/tst_map.qml
+4 −3 test/qml/qt5/tst_style_parameters.qml
+2 −1 test/qml/qt6/tst_map.qml
+4 −3 test/qml/qt6/tst_style_parameters.qml
+2 −2 test/widgets/CMakeLists.txt
+1 −1 vendor/maplibre-native

0 comments on commit 76b344d

Please sign in to comment.