Skip to content

Commit

Permalink
disable Qt on macOS for now due to multiple issues
Browse files Browse the repository at this point in the history
  • Loading branch information
skvark committed Dec 28, 2020
1 parent 5f56caf commit fd4e604
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 12 deletions.
4 changes: 1 addition & 3 deletions cv2/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@
pass

# the Qt plugin is included currently only in the pre-built wheels
if (
sys.platform == "darwin" or sys.platform.startswith("linux")
) and ci_and_not_headless:
if sys.platform.startswith("linux") and ci_and_not_headless:
os.environ["QT_QPA_PLATFORM_PLUGIN_PATH"] = os.path.join(
os.path.dirname(os.path.abspath(__file__)), "qt", "plugins"
)
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ def main():
if (
not build_headless
and "bdist_wheel" in sys.argv
and (sys.platform == "darwin" or sys.platform.startswith("linux"))
and sys.platform.startswith("linux")
):
cmake_args.append("-DWITH_QT=5")
subprocess.check_call("patch -p1 < patches/patchQtPlugins", shell=True)
Expand Down
16 changes: 8 additions & 8 deletions travis_config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -115,15 +115,15 @@ function pre_build {
brew install ffmpeg_opencv
fi

echo 'Installing qt5'
# echo 'Installing qt5'

if [ -n "$CACHE_STAGE" ]; then
echo "Qt5 has bottle, no caching needed"
else
brew switch qt 5.13.2
brew pin qt
export PATH="/usr/local/opt/qt/bin:$PATH"
fi
# if [ -n "$CACHE_STAGE" ]; then
# echo "Qt5 has bottle, no caching needed"
# else
# brew switch qt 5.13.2
# brew pin qt
# export PATH="/usr/local/opt/qt/bin:$PATH"
# fi

if [ -n "$CACHE_STAGE" ]; then
brew_go_bootstrap_mode 0
Expand Down

0 comments on commit fd4e604

Please sign in to comment.