From fd4e6040af94d9db3da25874132ca092b4c9e3a1 Mon Sep 17 00:00:00 2001
From: Olli-Pekka Heinisuo <op.heinisuo@gmail.com>
Date: Mon, 28 Dec 2020 20:40:12 +0200
Subject: [PATCH] disable Qt on macOS for now due to multiple issues

---
 cv2/__init__.py  |  4 +---
 setup.py         |  2 +-
 travis_config.sh | 16 ++++++++--------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/cv2/__init__.py b/cv2/__init__.py
index d665b75c..0c080d52 100644
--- a/cv2/__init__.py
+++ b/cv2/__init__.py
@@ -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"
     )
diff --git a/setup.py b/setup.py
index a4f9f729..67f22c60 100644
--- a/setup.py
+++ b/setup.py
@@ -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)
diff --git a/travis_config.sh b/travis_config.sh
index 063baf8a..9ba0bb11 100644
--- a/travis_config.sh
+++ b/travis_config.sh
@@ -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