-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
(#5440) Add Qt integration to sentry
* Add Qt integration to sentry * Update recipes/sentry-native/all/conanfile.py Co-authored-by: ericLemanissier <ericLemanissier@users.noreply.github.com> * Add qt requirement * Set temporary qt to True * Add openssl/1.1.1j requirement * Find conan qt patch * Remove qt requirement * Restore qt requirement and simpler patch * Handle older version * Specific patch for 0.4.7 * Add missing patch * Move patch to build() * Bump openssl version to 1.1.1k Co-authored-by: Chris Mc <prince.chrismc@gmail.com> * touch Co-authored-by: ericLemanissier <ericLemanissier@users.noreply.github.com> Co-authored-by: Chris Mc <prince.chrismc@gmail.com>
- Loading branch information
1 parent
5788f3d
commit 3768c7f
Showing
5 changed files
with
76 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
recipes/sentry-native/all/patches/find-conan-qt-0.4.7.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index e7d0f33..3fd4323 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -447,8 +447,8 @@ endif() | ||
|
||
option(SENTRY_INTEGRATION_QT "Build Qt integration") | ||
if(SENTRY_INTEGRATION_QT) | ||
- find_package(Qt5 COMPONENTS Core REQUIRED) | ||
- target_link_libraries(sentry PRIVATE Qt5::Core) | ||
+ find_package(qt REQUIRED) | ||
+ target_link_libraries(sentry PRIVATE qt::qt) | ||
endif() | ||
|
||
include(CMakePackageConfigHelpers) |
15 changes: 15 additions & 0 deletions
15
recipes/sentry-native/all/patches/find-conan-qt-0.4.8.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index 2407fca..89416c7 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -460,8 +460,8 @@ endif() | ||
|
||
option(SENTRY_INTEGRATION_QT "Build Qt integration") | ||
if(SENTRY_INTEGRATION_QT) | ||
- find_package(Qt5 COMPONENTS Core REQUIRED) | ||
- target_link_libraries(sentry PRIVATE Qt5::Core) | ||
+ find_package(qt REQUIRED) | ||
+ target_link_libraries(sentry PRIVATE qt::qt) | ||
endif() | ||
|
||
include(CMakePackageConfigHelpers) |
24 changes: 24 additions & 0 deletions
24
recipes/sentry-native/all/patches/find-conan-qt-0.4.9.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index 8a74a93..1782a69 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -461,17 +461,8 @@ endif() | ||
|
||
option(SENTRY_INTEGRATION_QT "Build Qt integration") | ||
if(SENTRY_INTEGRATION_QT) | ||
- if(QT_DEFAULT_MAJOR_VERSION) | ||
- # Let user choose major version | ||
- set(Qt_VERSION_MAJOR ${QT_DEFAULT_MAJOR_VERSION}) | ||
- else() | ||
- # Find best match, prioritizing Qt 6 if available | ||
- find_package(Qt NAMES Qt6 Qt5 COMPONENTS Core REQUIRED) | ||
- endif() | ||
- find_package(Qt${Qt_VERSION_MAJOR} COMPONENTS Core REQUIRED) | ||
- message(STATUS "Found Qt: ${Qt${Qt_VERSION_MAJOR}_DIR} " | ||
- "(found version \"${Qt${Qt_VERSION_MAJOR}_VERSION}\")") | ||
- target_link_libraries(sentry PRIVATE Qt${Qt_VERSION_MAJOR}::Core) | ||
+ find_package(qt REQUIRED) | ||
+ target_link_libraries(sentry PRIVATE qt::qt) | ||
endif() | ||
|
||
include(CMakePackageConfigHelpers) |