Skip to content

Commit fbcfa54

Browse files
committed
switch to Qt5
1 parent 37ef0d5 commit fbcfa54

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

setup.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,12 @@ def main():
123123
] + (["-DOPENCV_EXTRA_MODULES_PATH=" + os.path.abspath("opencv_contrib/modules")] if build_contrib else [])
124124

125125
# OS-specific components
126-
if (sys.platform == 'darwin' or sys.platform.startswith('linux')) and not build_headless:
126+
if sys.platform.startswith('linux') and not build_headless:
127127
cmake_args.append("-DWITH_QT=4")
128128

129+
if sys.platform == 'darwin' and not build_headless:
130+
cmake_args.append("-DWITH_QT=5")
131+
129132
if build_headless:
130133
# it seems that cocoa cannot be disabled so on macOS the package is not truly headless
131134
cmake_args.append("-DWITH_WIN32UI=OFF")

travis_config.sh

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,11 @@ function pre_build {
9696
brew_add_local_bottles
9797
fi
9898

99-
echo 'Installing QT4'
100-
brew tap | grep -qxF cartr/qt4 || brew tap cartr/qt4
99+
echo 'Installing qt5'
101100
if [ -n "$CACHE_STAGE" ]; then
102-
brew_install_and_cache_within_time_limit cartr/qt4/qt@4 || { [ $? -gt 1 ] && return 2 || return 0; }
101+
brew_install_and_cache_within_time_limit qt5 || { [ $? -gt 1 ] && return 2 || return 0; }
103102
else
104-
brew tap --repair
105-
brew install cartr/qt4/qt@4
103+
brew install qt5
106104
fi
107105

108106
echo 'Installing FFmpeg'

0 commit comments

Comments
 (0)