Skip to content

Commit fd4e604

Browse files
committed
disable Qt on macOS for now due to multiple issues
1 parent 5f56caf commit fd4e604

File tree

3 files changed

+10
-12
lines changed

3 files changed

+10
-12
lines changed

cv2/__init__.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@
1919
pass
2020

2121
# the Qt plugin is included currently only in the pre-built wheels
22-
if (
23-
sys.platform == "darwin" or sys.platform.startswith("linux")
24-
) and ci_and_not_headless:
22+
if sys.platform.startswith("linux") and ci_and_not_headless:
2523
os.environ["QT_QPA_PLATFORM_PLUGIN_PATH"] = os.path.join(
2624
os.path.dirname(os.path.abspath(__file__)), "qt", "plugins"
2725
)

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ def main():
172172
if (
173173
not build_headless
174174
and "bdist_wheel" in sys.argv
175-
and (sys.platform == "darwin" or sys.platform.startswith("linux"))
175+
and sys.platform.startswith("linux")
176176
):
177177
cmake_args.append("-DWITH_QT=5")
178178
subprocess.check_call("patch -p1 < patches/patchQtPlugins", shell=True)

travis_config.sh

+8-8
Original file line numberDiff line numberDiff line change
@@ -115,15 +115,15 @@ function pre_build {
115115
brew install ffmpeg_opencv
116116
fi
117117

118-
echo 'Installing qt5'
118+
# echo 'Installing qt5'
119119

120-
if [ -n "$CACHE_STAGE" ]; then
121-
echo "Qt5 has bottle, no caching needed"
122-
else
123-
brew switch qt 5.13.2
124-
brew pin qt
125-
export PATH="/usr/local/opt/qt/bin:$PATH"
126-
fi
120+
# if [ -n "$CACHE_STAGE" ]; then
121+
# echo "Qt5 has bottle, no caching needed"
122+
# else
123+
# brew switch qt 5.13.2
124+
# brew pin qt
125+
# export PATH="/usr/local/opt/qt/bin:$PATH"
126+
# fi
127127

128128
if [ -n "$CACHE_STAGE" ]; then
129129
brew_go_bootstrap_mode 0

0 commit comments

Comments
 (0)