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.

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

Meta qt6 PR #22835

Merged
merged 25 commits into from
Mar 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
2279559
qt: add QT_NO_DEBUG define in release build
technic Sep 6, 2023
b0e5751
fix condition for QT_NO_DEBUG define
technic Sep 8, 2023
368e279
Qt6: add d3d12 system lib on Windows
valgur Dec 7, 2023
ad656af
Qt6: make d3d12 conditional on Qt version
valgur Dec 7, 2023
f3f6122
Qt6: update all system dependency lists
valgur Jan 20, 2024
7a9442a
Fix a typo
valgur Jan 20, 2024
34519bc
qt6: add tools macros
ericLemanissier Jan 25, 2024
7524dd5
require explicitely gstreamer
ericLemanissier Feb 5, 2024
3db5d65
bump deps
ericLemanissier Feb 5, 2024
c6a664d
fix gstreamer consumption
ericLemanissier Feb 5, 2024
08266b1
fix cmake_find_mode of deps
ericLemanissier Feb 5, 2024
d030b9c
Merge branch 'master' into qt6
ericLemanissier Feb 13, 2024
b2862aa
Merge branch 'master' into qt
ericLemanissier Feb 13, 2024
958386b
Merge pull request #62 from ericLemanissier/qt6
ericLemanissier Feb 21, 2024
7975d3d
Merge pull request #63 from ericLemanissier/qt
ericLemanissier Feb 21, 2024
74d59c9
Merge pull request #64 from valgur/patch-2
ericLemanissier Feb 21, 2024
a751979
Merge pull request #65 from technic/master
ericLemanissier Feb 21, 2024
1eaefa7
Qt6: minor formatting fixes
valgur Feb 21, 2024
b1f22bb
Merge pull request #67 from valgur/patch-2
ericLemanissier Feb 21, 2024
bbb8231
qt 6.6.2
ericLemanissier Feb 21, 2024
79c6f2b
Merge branch 'qt662' into meta_qt6
ericLemanissier Feb 21, 2024
e0498ab
fix patching
ericLemanissier Feb 21, 2024
41876ae
Merge branch 'qt662' into meta_qt6
ericLemanissier Feb 21, 2024
025e554
Merge branch 'master' of https://github.com/conan-io/conan-center-ind…
ericLemanissier Mar 4, 2024
b4ff473
trigger CI without conflict
uilianries Mar 4, 2024
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
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
Loading