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

Add Qt integration to sentry #5440

Merged
merged 15 commits into from
May 25, 2021
Merged

Add Qt integration to sentry #5440

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ec73a62
Add Qt integration to sentry
MartinDelille May 5, 2021
94c2472
Update recipes/sentry-native/all/conanfile.py
MartinDelille May 5, 2021
748ef98
Add qt requirement
MartinDelille May 6, 2021
37f8828
Set temporary qt to True
MartinDelille May 6, 2021
1094c43
Add openssl/1.1.1j requirement
MartinDelille May 6, 2021
71fb16b
Find conan qt patch
MartinDelille May 6, 2021
4fdba19
Remove qt requirement
MartinDelille May 6, 2021
d24578e
Restore qt requirement and simpler patch
MartinDelille May 6, 2021
e64f7ed
Handle older version
MartinDelille May 6, 2021
e05d708
Specific patch for 0.4.7
MartinDelille May 6, 2021
86b733b
Add missing patch
MartinDelille May 7, 2021
d763fc0
Move patch to build()
MartinDelille May 9, 2021
dc5273d
Bump openssl version to 1.1.1k
MartinDelille May 9, 2021
9ab5bcc
Merge branch 'master' into sentry-qt
MartinDelille May 25, 2021
51be319
touch
MartinDelille May 25, 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
5 changes: 4 additions & 1 deletion recipes/sentry-native/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,14 @@ class SentryNativeConan(ConanFile):
"fPIC": [True, False],
"backend": ["none", "inproc", "crashpad", "breakpad"],
"transport": ["none", "curl", "winhttp"],
"qt": [True, False],
}
default_options = {
"shared": False,
"fPIC": True,
"backend": "inproc",
"transport": "curl"
"transport": "curl",
"qt": False,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is qt integration by default useful?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes but at the expense of current users who do no require it

https://docs.sentry.io/platforms/native/guides/qt/#install

Looks off by default from upstream

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

buildroot has some kind of ci system where it builds random combinations to find regressions.
Something similar where non-default option combinations are built would be useful.

}

_cmake = None
Expand Down Expand Up @@ -73,6 +75,7 @@ def _configure_cmake(self):
self._cmake.definitions["SENTRY_ENABLE_INSTALL"] = True
self._cmake.definitions["SENTRY_TRANSPORT"] = self.options.transport
self._cmake.definitions["SENTRY_PIC"] = self.options.get_safe("fPIC", True)
self._cmake.definitions["SENTRY_INTEGRATION_QT"] = self.options.get_safe("qt", False)
MartinDelille marked this conversation as resolved.
Show resolved Hide resolved
self._cmake.configure()
return self._cmake

Expand Down