File tree 3 files changed +10
-12
lines changed
3 files changed +10
-12
lines changed Original file line number Diff line number Diff line change 19
19
pass
20
20
21
21
# 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 :
25
23
os .environ ["QT_QPA_PLATFORM_PLUGIN_PATH" ] = os .path .join (
26
24
os .path .dirname (os .path .abspath (__file__ )), "qt" , "plugins"
27
25
)
Original file line number Diff line number Diff line change @@ -172,7 +172,7 @@ def main():
172
172
if (
173
173
not build_headless
174
174
and "bdist_wheel" in sys .argv
175
- and ( sys .platform == "darwin" or sys . platform . startswith ("linux" ) )
175
+ and sys .platform . startswith ("linux" )
176
176
):
177
177
cmake_args .append ("-DWITH_QT=5" )
178
178
subprocess .check_call ("patch -p1 < patches/patchQtPlugins" , shell = True )
Original file line number Diff line number Diff line change @@ -115,15 +115,15 @@ function pre_build {
115
115
brew install ffmpeg_opencv
116
116
fi
117
117
118
- echo ' Installing qt5'
118
+ # echo 'Installing qt5'
119
119
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
127
127
128
128
if [ -n " $CACHE_STAGE " ]; then
129
129
brew_go_bootstrap_mode 0
You can’t perform that action at this time.
0 commit comments