Skip to content

[opencv4] Changed dependency on qt5 to qt5-base, closes microsoft/vcpkg#11138 #11201

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

Merged
strega-nil merged 4 commits into from
May 8, 2020
Merged

[opencv4] Changed dependency on qt5 to qt5-base, closes microsoft/vcpkg#11138 #11201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cdab71b
Changed dependency on qt5 to qt5-base, closes microsoft/vcpkg#11138
venabled May 6, 2020
0b643c6
Bump the correct control file.
BillyONeal May 7, 2020
5961a3f
Also added qt5-base as dep for opencv3, bumped version
venabled May 7, 2020
3b583d5
Changed dep for `qt` feature from `qt5` to `qt5-base`, bumped ver
venabled May 7, 2020
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
4 changes: 2 additions & 2 deletions ports/opencv2/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: opencv2
Version: 2.4.13.7
Version: 2.4.13.7-1
Build-Depends: zlib
Description: computer vision library, version 2
Default-Features: eigen, jpeg, opengl, png, tiff
Expand Down Expand Up @@ -37,7 +37,7 @@ Build-Depends: libpng
Description: PNG support for opencv

Feature: qt
Build-Depends: qt5
Build-Depends: qt5-base
Description: Qt GUI support for opencv

Feature: tiff
Expand Down
4 changes: 2 additions & 2 deletions ports/opencv3/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: opencv3
Version: 3.4.7-2
Version: 3.4.7-3
Build-Depends: protobuf, zlib
Homepage: https://github.com/opencv/opencv
Description: computer vision library
Expand Down Expand Up @@ -63,7 +63,7 @@ Build-Depends: libpng
Description: PNG support for opencv

Feature: qt
Build-Depends: qt5
Build-Depends: qt5-base
Description: Qt GUI support for opencv

Feature: sfm
Expand Down
4 changes: 2 additions & 2 deletions ports/opencv4/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: opencv4
Version: 4.1.1-4
Version: 4.1.1-5
Build-Depends: protobuf, zlib
Homepage: https://github.com/opencv/opencv
Description: computer vision library
Expand Down Expand Up @@ -66,7 +66,7 @@ Build-Depends: libpng
Description: PNG support for opencv

Feature: qt
Build-Depends: qt5
Build-Depends: qt5-base
Description: Qt GUI support for opencv

Feature: sfm
Expand Down