Skip to content

Commit

Permalink
(#22835) Meta qt6 PR
Browse files Browse the repository at this point in the history
* qt: add QT_NO_DEBUG define in release build

* fix condition for QT_NO_DEBUG define

* Qt6: add d3d12 system lib on Windows

Qt 6.6.0 added `d3d12` to the list of system libraries on Windows it links against:
qt/qtbase@84fb0de#diff-2d8b127aed7a6123be24b80481b760ec4e9cc251e19d668d936dc09e87147a0e

This is currently breaking the build in #18794.

* Qt6: make d3d12 conditional on Qt version

d3d12.dll was added with Windows 10. Don't want to potentially limit the range of supported OS versions unnecessarily.

* Qt6: update all system dependency lists

* Fix a typo

* qt6: add tools macros

fixes #22530

* require explicitely gstreamer

* bump deps

* fix gstreamer consumption

* fix cmake_find_mode of deps

* Qt6: minor formatting fixes

* qt 6.6.2

generated with:
conan config install https://github.com/conan-io/conan-extensions.git
conan cci:upgrade-qt-recipe 6.6.2

* fix patching

* trigger CI without conflict

Signed-off-by: Uilian Ries <[email protected]>

---------

Signed-off-by: Uilian Ries <[email protected]>
Co-authored-by: Alex Maystrenko <[email protected]>
Co-authored-by: Martin Valgur <[email protected]>
Co-authored-by: Uilian Ries <[email protected]>
  • Loading branch information
4 people authored Mar 4, 2024
1 parent 537270a commit 13bc0dd
Show file tree
Hide file tree
Showing 4 changed files with 538 additions and 54 deletions.
28 changes: 28 additions & 0 deletions recipes/qt/6.x.x/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,26 @@
sources:
"6.6.2":
url:
- "https://download.qt.io/official_releases/qt/6.6/6.6.2/single/qt-everywhere-src-6.6.2.tar.xz"
- "https://download.qt.io/archive/qt/6.6/6.6.2/single/qt-everywhere-src-6.6.2.tar.xz"
- "https://mirrors.20i.com/pub/qt.io/archive/qt/6.6/6.6.2/single/qt-everywhere-src-6.6.2.tar.xz"
- "https://mirrors.ukfast.co.uk/sites/qt.io/archive/qt/6.6/6.6.2/single/qt-everywhere-src-6.6.2.tar.xz"
- "https://ftp.nluug.nl/languages/qt/archive/qt/6.6/6.6.2/single/qt-everywhere-src-6.6.2.tar.xz"
- "https://mirror.netcologne.de/qtproject/archive/qt/6.6/6.6.2/single/qt-everywhere-src-6.6.2.tar.xz"
- "https://qt-mirror.dannhauer.de/archive/qt/6.6/6.6.2/single/qt-everywhere-src-6.6.2.tar.xz"
- "https://ftp.fau.de/qtproject/archive/qt/6.6/6.6.2/single/qt-everywhere-src-6.6.2.tar.xz"
- "https://mirrors.dotsrc.org/qtproject/archive/qt/6.6/6.6.2/single/qt-everywhere-src-6.6.2.tar.xz"
- "https://ftp.acc.umu.se/mirror/qt.io/qtproject/archive/qt/6.6/6.6.2/single/qt-everywhere-src-6.6.2.tar.xz"
- "https://www.nic.funet.fi/pub/mirrors/download.qt-project.org/archive/qt/6.6/6.6.2/single/qt-everywhere-src-6.6.2.tar.xz"
- "https://qtproject.mirror.liquidtelecom.com/archive/qt/6.6/6.6.2/single/qt-everywhere-src-6.6.2.tar.xz"
- "https://qt.mirror.constant.com/archive/qt/6.6/6.6.2/single/qt-everywhere-src-6.6.2.tar.xz"
- "https://mirrors.sau.edu.cn/qt/archive/qt/6.6/6.6.2/single/qt-everywhere-src-6.6.2.tar.xz"
- "https://mirrors.cloud.tencent.com/qt/archive/qt/6.6/6.6.2/single/qt-everywhere-src-6.6.2.tar.xz"
- "https://mirrors.ustc.edu.cn/qtproject/archive/qt/6.6/6.6.2/single/qt-everywhere-src-6.6.2.tar.xz"
- "https://mirrors.sjtug.sjtu.edu.cn/qt/archive/qt/6.6/6.6.2/single/qt-everywhere-src-6.6.2.tar.xz"
- "https://ftp.jaist.ac.jp/pub/qtproject/archive/qt/6.6/6.6.2/single/qt-everywhere-src-6.6.2.tar.xz"
- "https://ftp.yz.yamagata-u.ac.jp/pub/qtproject/archive/qt/6.6/6.6.2/single/qt-everywhere-src-6.6.2.tar.xz"
sha256: "3c1e42b3073ade1f7adbf06863c01e2c59521b7cc2349df2f74ecd7ebfcb922d"
"6.6.1":
url:
- "https://download.qt.io/official_releases/qt/6.6/6.6.1/single/qt-everywhere-src-6.6.1.tar.xz"
Expand Down Expand Up @@ -63,6 +85,12 @@ sources:
- "https://mirrors.ustc.edu.cn/qtproject/archive/qt/6.3/6.3.2/single/qt-everywhere-src-6.3.2.tar.xz"
sha256: "b90524f686224a0e5a945c1d65307e16a375348dbe275c9ac11de171fe31374a"
patches:
"6.6.2":
- "base_path": "qtwebengine"
"patch_description": "Workaround for too long .rps file name"
"patch_file": "patches/c72097e_6.6.0.diff"
"patch_source": "https://codereview.qt-project.org/c/yocto/meta-qt5/+/192172"
"patch_type": "bugfix"
"6.6.1":
- "base_path": "qtwebengine"
"patch_description": "Workaround for too long .rps file name"
Expand Down
Loading

0 comments on commit 13bc0dd

Please sign in to comment.