提交 fd4e6040 编写于 作者: O Olli-Pekka Heinisuo

disable Qt on macOS for now due to multiple issues

上级 5f56caf2
...@@ -19,9 +19,7 @@ except: ...@@ -19,9 +19,7 @@ except:
pass pass
# the Qt plugin is included currently only in the pre-built wheels # the Qt plugin is included currently only in the pre-built wheels
if ( if sys.platform.startswith("linux") and ci_and_not_headless:
sys.platform == "darwin" or sys.platform.startswith("linux")
) and ci_and_not_headless:
os.environ["QT_QPA_PLATFORM_PLUGIN_PATH"] = os.path.join( os.environ["QT_QPA_PLATFORM_PLUGIN_PATH"] = os.path.join(
os.path.dirname(os.path.abspath(__file__)), "qt", "plugins" os.path.dirname(os.path.abspath(__file__)), "qt", "plugins"
) )
......
...@@ -172,7 +172,7 @@ def main(): ...@@ -172,7 +172,7 @@ def main():
if ( if (
not build_headless not build_headless
and "bdist_wheel" in sys.argv 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") cmake_args.append("-DWITH_QT=5")
subprocess.check_call("patch -p1 < patches/patchQtPlugins", shell=True) subprocess.check_call("patch -p1 < patches/patchQtPlugins", shell=True)
......
...@@ -115,15 +115,15 @@ function pre_build { ...@@ -115,15 +115,15 @@ function pre_build {
brew install ffmpeg_opencv brew install ffmpeg_opencv
fi fi
echo 'Installing qt5' # echo 'Installing qt5'
if [ -n "$CACHE_STAGE" ]; then # if [ -n "$CACHE_STAGE" ]; then
echo "Qt5 has bottle, no caching needed" # echo "Qt5 has bottle, no caching needed"
else # else
brew switch qt 5.13.2 # brew switch qt 5.13.2
brew pin qt # brew pin qt
export PATH="/usr/local/opt/qt/bin:$PATH" # export PATH="/usr/local/opt/qt/bin:$PATH"
fi # fi
if [ -n "$CACHE_STAGE" ]; then if [ -n "$CACHE_STAGE" ]; then
brew_go_bootstrap_mode 0 brew_go_bootstrap_mode 0
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册