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

Qt: add component support for Qt5 #5691

Merged
merged 16 commits into from
Jun 15, 2021
Merged

Qt: add component support for Qt5 #5691

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
121abbc
Backport Qt component support from qt6 recipe to qt5 recipe (resolves…
wdobbe May 18, 2021
87a293a
Backport Qt component support from qt6 recipe to qt5 recipe (resolves…
wdobbe May 20, 2021
632e944
Backport Qt component support from qt6 recipe to qt5 recipe (resolves…
wdobbe May 21, 2021
1dcef67
Backport Qt component support from qt6 recipe to qt5 recipe (resolves…
wdobbe May 22, 2021
d9dde78
Backport Qt component support from qt6 recipe to qt5 recipe (resolves…
wdobbe May 26, 2021
1af6015
Qt5: Add most of the remaining components in package_info. (resolves …
wdobbe May 27, 2021
4e5a70d
Change qtbluetooth module to qtconnectivity again, rebase to master
wdobbe May 27, 2021
74ca0b3
Qt5: Add modules datavisualization and networkauth. (resolves #4529)
wdobbe May 28, 2021
567f403
Qt5: Add MacOs plugins. (resolves #4529)
wdobbe May 28, 2021
f55dcfd
Qt5 components: with_mysql option is deleted for old compilers
wdobbe May 29, 2021
8de7dab
Implement feedback on PR #5691, remove not needed requirement and fun…
wdobbe Jun 1, 2021
2debdac
Qt5: add fixes that were lost with last rebase, re-enable QtWebEngine…
Jun 10, 2021
5c9e92d
Re-add typo fix for sqldrivers plugin type, was lost in last rebase
Jun 10, 2021
c357dad
Don't link to qt plugins when qt:shared=True. Implement PR feedback.
wdobbe Jun 11, 2021
118b92d
PR feedback. Upgrade dependencies to latest version.
wdobbe Jun 15, 2021
3e539a7
Increase expat dependency version to 2.4.1.
wdobbe Jun 15, 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
2 changes: 2 additions & 0 deletions recipes/qt/5.x.x/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ patches:
base_path: "qt5/qtwebengine"
- patch_file: "patches/fix-macdeployqt.diff"
base_path: "qt5/qttools"
- patch_file: "patches/QTBUG-88625.diff"
base_path: "qt5/qtwebengine"
Loading