Skip to content
This repository has been archived by the owner on Sep 24, 2024. It is now read-only.

Commit

Permalink
(conan-io#14592) qt6: use CMakeDeps
Browse files Browse the repository at this point in the history
* use is_mvc

* use CMakeDeps

fixes conan-io#13144

* use PkgConfigDeps

* use modern CMake integration

* debug cmake find package

* work arround conan-io/conan#11962

* don't test with qmake on static qt

* fix Invalid character escape

cf conan-io/conan#10539
  • Loading branch information
ericLemanissier authored Dec 13, 2022
1 parent 0ab4f63 commit 6905611
Show file tree
Hide file tree
Showing 3 changed files with 194 additions and 222 deletions.
30 changes: 15 additions & 15 deletions recipes/qt/6.x.x/conandata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,41 +25,41 @@ sources:
sha256: "cfe41905b6bde3712c65b102ea3d46fc80a44c9d1487669f14e4a6ee82ebb8fd"
patches:
"6.4.1":
- base_path: "qt6/qtbase/cmake"
- base_path: "qtbase/cmake"
patch_file: "patches/qt6-pri-helpers-fix.diff"
- patch_file: "patches/c72097e.diff"
base_path: "qt6/qtwebengine"
base_path: "qtwebengine"
- patch_file: "patches/d13958d.diff"
base_path: "qt6/qtbase"
base_path: "qtbase"
patch_description: "Fix PCRE2 detection"
patch_type: "bugfix"
patch_source: "https://codereview.qt-project.org/c/qt/qtbase/+/445885"
- patch_file: "patches/3801bba82.patch"
base_path: "qt6/qtwebengine/src/3rdparty"
base_path: "qtwebengine/src/3rdparty"
patch_description: "fix qtwebengine with MSVC2022"
patch_type: "portability"
patch_source: "https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/444132"
"6.3.2":
- base_path: "qt6/qtbase/cmake"
- base_path: "qtbase/cmake"
patch_file: "patches/qt6-pri-helpers-fix.diff"
- patch_file: "patches/c72097e.diff"
base_path: "qt6/qtwebengine"
base_path: "qtwebengine"
- patch_file: "patches/d13958d.diff"
base_path: "qt6/qtbase"
base_path: "qtbase"
"6.2.4":
- base_path: "qt6/qtdeclarative"
- base_path: "qtdeclarative"
patch_file: "patches/32451d5.diff"
- base_path: "qt6/qtbase/cmake"
- base_path: "qtbase/cmake"
patch_file: "patches/qt6-pri-helpers-fix.diff"
- patch_file: "patches/c72097e.diff"
base_path: "qt6/qtwebengine"
base_path: "qtwebengine"
- patch_file: "patches/138a720.diff"
base_path: "qt6/qtwebengine/src/3rdparty"
base_path: "qtwebengine/src/3rdparty"
- patch_file: "patches/CVE-2022-1096-qtwebengine-6.2.diff"
base_path: "qt6/qtwebengine"
base_path: "qtwebengine"
- patch_file: "patches/CVE-2022-25255-qprocess6-2.diff"
base_path: "qt6/qtbase"
base_path: "qtbase"
- patch_file: "patches/CVE-2022-25643-6.2.diff"
base_path: "qt6/qtbase"
base_path: "qtbase"
- patch_file: "patches/d13958d_.diff"
base_path: "qt6/qtbase"
base_path: "qtbase"
Loading

0 comments on commit 6905611

Please sign in to comment.