Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: opencv/opencv-python
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: swarmer/opencv-python
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Feb 17, 2020

  1. Fix linux qt version

    @swarmer
    swarmer authored Feb 17, 2020
    Copy the full SHA
    d35b3df View commit details
Showing with 1 addition and 4 deletions.
  1. +1 −4 setup.py
5 changes: 1 addition & 4 deletions setup.py
View file
Original file line number Diff line number Diff line change
@@ -123,10 +123,7 @@ def main():
] + (["-DOPENCV_EXTRA_MODULES_PATH=" + os.path.abspath("opencv_contrib/modules")] if build_contrib else [])

# OS-specific components
if sys.platform.startswith('linux') and not build_headless:
cmake_args.append("-DWITH_QT=4")

if sys.platform == 'darwin' and not build_headless:
if sys.platform in ('darwin', 'linux') and not build_headless:
cmake_args.append("-DWITH_QT=5")

if build_headless: