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 6.2.0 #7469

Merged
merged 20 commits into from
Oct 24, 2021
Merged

Qt 6.2.0 #7469

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
56ab41f
qt 6.2.0
ericLemanissier Sep 30, 2021
36c4ebf
add qtmultimedia
ericLemanissier Sep 30, 2021
1a3aabe
add qtlocation
ericLemanissier Sep 30, 2021
4d2f08e
add qtsensors
ericLemanissier Sep 30, 2021
13ceffa
add qtconnectivity
ericLemanissier Sep 30, 2021
71299a6
add qtserialport and qtserialbus
ericLemanissier Sep 30, 2021
dbe69cb
add qtwebsockets and qtwebchannel
ericLemanissier Sep 30, 2021
ce7c1d2
add qtwebengine
ericLemanissier Sep 30, 2021
329302a
add qtremoteobjects
ericLemanissier Sep 30, 2021
5d93de8
add qtwebview
ericLemanissier Sep 30, 2021
3e6359b
add qtwebengine patche
ericLemanissier Sep 30, 2021
1078a8e
qt: Update Conan conventions
bincrafters-user Sep 30, 2021
0a9e010
Update conanfile.py
ericLemanissier Sep 30, 2021
07d24a8
Update conanfile.py
ericLemanissier Sep 30, 2021
81f72a5
add missing file and remove old versions
ericLemanissier Oct 1, 2021
8be8954
Update conanfile.py
ericLemanissier Oct 18, 2021
931adc0
Update CMakeLists.txt
ericLemanissier Oct 19, 2021
a79e1d9
Update conanfile.py
ericLemanissier Oct 19, 2021
03bb4d0
Update conanfile.py
ericLemanissier Oct 19, 2021
a4dd800
Update conanfile.py
ericLemanissier Oct 20, 2021
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
74 changes: 45 additions & 29 deletions recipes/qt/6.x.x/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,51 +27,67 @@ sources:
- "https://www.funet.fi/pub/mirrors/download.qt-project.org/archive/qt/6.0/6.0.4/single/qt-everywhere-src-6.0.4.tar.xz"
- "https://ftp.fau.de/qtproject/archive/qt/6.0/6.0.4/single/qt-everywhere-src-6.0.4.tar.xz"
sha256: "677db6472420f9046b16f7c0d0aa15c4f11f344462a6374feb860625c12fc72b"
"6.1.0":
url:
- "https://download.qt.io/archive/qt/6.1/6.1.0/single/qt-everywhere-src-6.1.0.tar.xz"
- "https://qt-mirror.dannhauer.de/archive/qt/6.1/6.1.0/single/qt-everywhere-src-6.1.0.tar.xz"
- "https://www.funet.fi/pub/mirrors/download.qt-project.org/archive/qt/6.1/6.1.0/single/qt-everywhere-src-6.1.0.tar.xz"
- "https://ftp.fau.de/qtproject/archive/qt/6.1/6.1.0/single/qt-everywhere-src-6.1.0.tar.xz"
sha256: "326a710b08b0973bb4f5306a786548d8b8dd656db75ce9f3f85ea32680d3c88a"
"6.1.1":
url:
- "https://download.qt.io/archive/qt/6.1/6.1.1/single/qt-everywhere-src-6.1.1.tar.xz"
- "https://qt-mirror.dannhauer.de/archive/qt/6.1/6.1.1/single/qt-everywhere-src-6.1.1.tar.xz"
- "https://www.funet.fi/pub/mirrors/download.qt-project.org/archive/qt/6.1/6.1.1/single/qt-everywhere-src-6.1.1.tar.xz"
- "https://ftp.fau.de/qtproject/archive/qt/6.1/6.1.1/single/qt-everywhere-src-6.1.1.tar.xz"
sha256: "6ac937aae4c7b5a3eac90ea4d13f31ded9f78ebc93007bb919fae65c58c808c3"
"6.1.2":
url:
- "https://download.qt.io/archive/qt/6.1/6.1.2/single/qt-everywhere-src-6.1.2.tar.xz"
- "https://qt-mirror.dannhauer.de/archive/qt/6.1/6.1.2/single/qt-everywhere-src-6.1.2.tar.xz"
- "https://www.funet.fi/pub/mirrors/download.qt-project.org/archive/qt/6.1/6.1.2/single/qt-everywhere-src-6.1.2.tar.xz"
- "https://ftp.fau.de/qtproject/archive/qt/6.1/6.1.2/single/qt-everywhere-src-6.1.2.tar.xz"
sha256: "4b40f10eb188506656f13dbf067b714145047f41d7bf83f03b727fa1c7c4cdcb"
#"6.1.0":
# url:
# - "https://download.qt.io/archive/qt/6.1/6.1.0/single/qt-everywhere-src-6.1.0.tar.xz"
# - "https://qt-mirror.dannhauer.de/archive/qt/6.1/6.1.0/single/qt-everywhere-src-6.1.0.tar.xz"
# - "https://www.funet.fi/pub/mirrors/download.qt-project.org/archive/qt/6.1/6.1.0/single/qt-everywhere-src-6.1.0.tar.xz"
# - "https://ftp.fau.de/qtproject/archive/qt/6.1/6.1.0/single/qt-everywhere-src-6.1.0.tar.xz"
# sha256: "326a710b08b0973bb4f5306a786548d8b8dd656db75ce9f3f85ea32680d3c88a"
#"6.1.1":
# url:
# - "https://download.qt.io/archive/qt/6.1/6.1.1/single/qt-everywhere-src-6.1.1.tar.xz"
# - "https://qt-mirror.dannhauer.de/archive/qt/6.1/6.1.1/single/qt-everywhere-src-6.1.1.tar.xz"
# - "https://www.funet.fi/pub/mirrors/download.qt-project.org/archive/qt/6.1/6.1.1/single/qt-everywhere-src-6.1.1.tar.xz"
# - "https://ftp.fau.de/qtproject/archive/qt/6.1/6.1.1/single/qt-everywhere-src-6.1.1.tar.xz"
# sha256: "6ac937aae4c7b5a3eac90ea4d13f31ded9f78ebc93007bb919fae65c58c808c3"
#"6.1.2":
# url:
# - "https://download.qt.io/archive/qt/6.1/6.1.2/single/qt-everywhere-src-6.1.2.tar.xz"
# - "https://qt-mirror.dannhauer.de/archive/qt/6.1/6.1.2/single/qt-everywhere-src-6.1.2.tar.xz"
# - "https://www.funet.fi/pub/mirrors/download.qt-project.org/archive/qt/6.1/6.1.2/single/qt-everywhere-src-6.1.2.tar.xz"
# - "https://ftp.fau.de/qtproject/archive/qt/6.1/6.1.2/single/qt-everywhere-src-6.1.2.tar.xz"
# sha256: "4b40f10eb188506656f13dbf067b714145047f41d7bf83f03b727fa1c7c4cdcb"
"6.1.3":
url:
- "https://download.qt.io/archive/qt/6.1/6.1.3/single/qt-everywhere-src-6.1.3.tar.xz"
- "https://qt-mirror.dannhauer.de/archive/qt/6.1/6.1.3/single/qt-everywhere-src-6.1.3.tar.xz"
- "https://www.funet.fi/pub/mirrors/download.qt-project.org/archive/qt/6.1/6.1.3/single/qt-everywhere-src-6.1.3.tar.xz"
- "https://ftp.fau.de/qtproject/archive/qt/6.1/6.1.3/single/qt-everywhere-src-6.1.3.tar.xz"
sha256: "552342a81fa76967656b0301233b4b586d36967fad5cd110765347aebe07413c"
"6.2.0":
url:
- "https://download.qt.io/archive/qt/6.2/6.2.0/single/qt-everywhere-src-6.2.0.tar.xz"
- "https://qt-mirror.dannhauer.de/archive/qt/6.2/6.2.0/single/qt-everywhere-src-6.2.0.tar.xz"
- "https://www.funet.fi/pub/mirrors/download.qt-project.org/archive/qt/6.2/6.2.0/single/qt-everywhere-src-6.2.0.tar.xz"
- "https://ftp.fau.de/qtproject/archive/qt/6.2/6.2.0/single/qt-everywhere-src-6.2.0.tar.xz"
sha256: "60c2dc0ee86dd338e5c5194bd95922abfc097841e3e855693dfb4f5aaf0db4db"
patches:
"6.0.4":
- base_path: "qt6/qtbase/cmake"
patch_file: "patches/qt6-pri-helpers-fix.diff"
"6.1.0":
- base_path: "qt6/qtbase/cmake"
patch_file: "patches/qt6-pri-helpers-fix.diff"
"6.1.1":
- base_path: "qt6/qtbase/cmake"
patch_file: "patches/qt6-pri-helpers-fix.diff"
"6.1.2":
#"6.1.0":
# - base_path: "qt6/qtbase/cmake"
# patch_file: "patches/qt6-pri-helpers-fix.diff"
#"6.1.1":
# - base_path: "qt6/qtbase/cmake"
# patch_file: "patches/qt6-pri-helpers-fix.diff"
#"6.1.2":
# - base_path: "qt6/qtdeclarative"
# patch_file: "patches/32451d5.diff"
# - base_path: "qt6/qtbase/cmake"
# patch_file: "patches/qt6-pri-helpers-fix.diff"
"6.1.3":
- base_path: "qt6/qtdeclarative"
patch_file: "patches/32451d5.diff"
- base_path: "qt6/qtbase/cmake"
patch_file: "patches/qt6-pri-helpers-fix.diff"
"6.1.3":
"6.2.0":
- base_path: "qt6/qtdeclarative"
patch_file: "patches/32451d5.diff"
- base_path: "qt6/qtbase/cmake"
patch_file: "patches/qt6-pri-helpers-fix.diff"
- patch_file: "patches/c72097e.diff"
base_path: "qt6/qtwebengine"
- patch_file: "patches/138a720.diff"
base_path: "qt6/qtwebengine/src/3rdparty"
Loading