-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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.
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
Qt5 various fixes #24009
base: master
Are you sure you want to change the base?
Qt5 various fixes #24009
Conversation
🤖 Beep Boop! This pull request is making changes to 'recipes/qt//'. 👋 @ericLemanissier @jwillikers @MartinDelille @paulharris you might be interested. 😉 |
@@ -103,6 +103,8 @@ patches: | |||
"patch_file": "patches/fix-macdeployqt.diff" | |||
- "base_path": "qt5/qtwebengine/src/3rdparty" | |||
"patch_file": "patches/0001-Find-fontconfig-using-pkg-config.patch" | |||
- "base_path": "qt5/qtwebengine/src/3rdparty" | |||
"patch_file": "patches/Fix-errors-and-warnings-for-perfetto.patch" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fix for this QT bug https://bugreports.qt.io/browse/QTBUG-117073
@@ -55,7 +55,7 @@ class QtConan(ConanFile): | |||
"with_libjpeg": ["libjpeg", "libjpeg-turbo", False], | |||
"with_libpng": [True, False], | |||
"with_sqlite3": [True, False], | |||
"with_mysql": [True, False], | |||
"with_mysql": ["mysql", "mariadb", False], |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
support both mysql
and mariadb
as sql backend
@@ -192,7 +192,6 @@ def config_options(self): | |||
if self.settings.compiler in ["gcc", "clang"] and Version(self.settings.compiler.version) < "5.3": | |||
del self.options.with_mysql | |||
if self.settings.os == "Windows": | |||
self.options.with_mysql = False | |||
self.options.opengl = "dynamic" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
mysql also supported on windows! not sure why it was forced to force before
Conan v1 pipeline ✔️All green in build 1 (
Conan v2 pipeline ✔️
All green in build 1 ( |
Hooks produced the following warnings for commit a2adf70qt/5.15.12@#c23f1915ed3c2fa05377d47fd6465233
qt/5.15.11@#f01d0ab98e65889df50573b6757ab145
qt/5.15.10@#21c20edddde3c4b5028fde705226171d
qt/5.15.13@#316a3a1df18b935fafd9b94aa13ec9f5
qt/5.15.9@#851820aec492e1bd984f8d1102ec514f
|
* add qt cmake macros fixes #4574 * compatibility with conan < 1.33 * setup self.cpp_info.builddirs and remove unused cmake files
The msvc fixes have been merged separately as part of #24826, preserving authorship of this PR |
Specify library name and version: qt/5.15