Skip to content

Commit 8a6e17e

Browse files
committed
Revert "switch to Qt5"
This reverts commit fbcfa54.
1 parent fbcfa54 commit 8a6e17e

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

setup.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,9 @@ 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.startswith('linux') and not build_headless:
126+
if (sys.platform == 'darwin' or 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-
132129
if build_headless:
133130
# it seems that cocoa cannot be disabled so on macOS the package is not truly headless
134131
cmake_args.append("-DWITH_WIN32UI=OFF")

travis_config.sh

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

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

106108
echo 'Installing FFmpeg'

0 commit comments

Comments
 (0)