Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions conan_patches/qt/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
patches:
"5.15.16":
- "base_path": "qt5/qtbase"
"patch_file": "patches/android-19-jar.diff"
- "base_path": "qt5/qtbase"
"patch_file": "patches/android-19-java.diff"
- "base_path": "qt5/qtbase"
"patch_file": "patches/android-21-22.diff"
- "base_path": "qt5/qtbase"
Expand Down
71 changes: 0 additions & 71 deletions conan_patches/qt/patches/android-19-jar.diff

This file was deleted.

13 changes: 0 additions & 13 deletions conan_patches/qt/patches/android-19-java.diff

This file was deleted.

2 changes: 1 addition & 1 deletion conan_profiles/android-32
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ include(base/android)

[settings]
arch=armv7
os.api_level=19
os.api_level=21

[conf]
# remove after switching to API level >= 24
Expand Down
2 changes: 1 addition & 1 deletion conan_profiles/base/android
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ include(common)
compiler=clang
compiler.cppstd={{ vars.cppstd }}
compiler.libcxx=c++_shared
compiler.version=14
compiler.version=21
os=Android

[conf]
Expand Down
2 changes: 1 addition & 1 deletion conan_profiles/base/android-ndk
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[tool_requires]
android-ndk/r25c
android-ndk/r29
2 changes: 1 addition & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def config_options(self):
def requirements(self):
# lib
# boost::filesystem removed support for Windows < 10 in v1.87
boostMinVersion = "1.69"
boostMinVersion = "1.74"
if self.options.get_safe("target_pre_windows10", False):
self.requires(f"boost/[>={boostMinVersion} <1.87]")
else:
Expand Down