Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

qt 5.15.12 #21943

Merged
merged 5 commits into from
Jan 6, 2024
Merged

qt 5.15.12 #21943

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9979259
qt 5.15.12
ericLemanissier Dec 26, 2023
f741f67
bump deps
ericLemanissier Dec 26, 2023
9265a0d
unbump xkbcommon
ericLemanissier Dec 26, 2023
1c78f30
disable macos on arm for qt 5.15.9
ericLemanissier Dec 27, 2023
9bf2487
Update conanfile.py
ericLemanissier Dec 27, 2023
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
Prev Previous commit
Update conanfile.py
  • Loading branch information
@ericLemanissier
ericLemanissier authored Dec 27, 2023
commit 9bf24871d5ba9640d914f81251102540728abceb
2 changes: 1 addition & 1 deletion recipes/qt/5.x.x/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@
raise ConanInvalidConfiguration("sqlite3 option enable_column_metadata must be enabled for qt")

if Version(self.version) < "5.15.9" and self.settings.os == "Macos" and self.settings.arch == "armv8":
raise ConanInvalidConfiguration("qt doesnot support macOS on ARM before 5.15.9 (QTBUG-85279)")
raise ConanInvalidConfiguration("qt does not support macOS on ARM before 5.15.9 (QTBUG-85279)")

def requirements(self):
self.requires("zlib/[>=1.2.11 <2]")
Expand Down Expand Up @@ -925,7 +925,7 @@
filecontents += 'set(CMAKE_AUTOMOC_MACRO_NAMES "Q_OBJECT" "Q_GADGET" "Q_GADGET_EXPORT" "Q_NAMESPACE" "Q_NAMESPACE_EXPORT")\n'
save(self, os.path.join(self.package_folder, self._cmake_core_extras_file), filecontents)

def _create_private_module(module, dependencies=[]):

Check warning on line 928 in recipes/qt/5.x.x/conanfile.py

View workflow job for this annotation

GitHub Actions / Lint changed conanfile.py (v2 migration) 

 Dangerous default value [] as argument
if "Core" not in dependencies:
dependencies.append("Core")
dependencies_string = ';'.join(f'Qt5::{dependency}' for dependency in dependencies)
Expand Down Expand Up @@ -994,7 +994,7 @@
reqs.append(corrected_req)
return reqs

def _create_module(module, requires=[], has_include_dir=True):

Check warning on line 997 in recipes/qt/5.x.x/conanfile.py

View workflow job for this annotation

GitHub Actions / Lint changed conanfile.py (v2 migration) 

 Dangerous default value [] as argument
componentname = f"qt{module}"
assert componentname not in self.cpp_info.components, f"Module {module} already present in self.cpp_info.components"
self.cpp_info.components[componentname].set_property("cmake_target_name", f"Qt5::{module}")
Expand Down
Loading