upgrade macOS env to xcode9.4 and use Qt5

Author: skvark

.travis.yml

@@ -38,7 +38,7 @@ matrix:
   include:
 
     - os: osx
-      osx_image: xcode8.3
+      osx_image: xcode9.4
       stage: s1
       workspaces:
         create:
@@ -64,31 +64,31 @@ matrix:
       #further jobs in the list will use the same stage until the next assignment
     - stage: final
       os: osx
-      osx_image: xcode8.3
+      osx_image: xcode9.4
       env:
         - MB_PYTHON_VERSION=2.7
         - ENABLE_CONTRIB=0
         - ENABLE_HEADLESS=0
       workspaces:
         use: brew_cache
     - os: osx
-      osx_image: xcode8.3
+      osx_image: xcode9.4
       env:
         - MB_PYTHON_VERSION=3.5
         - ENABLE_CONTRIB=0
         - ENABLE_HEADLESS=0
       workspaces:
         use: brew_cache
     - os: osx
-      osx_image: xcode8.3
+      osx_image: xcode9.4
       env:
         - MB_PYTHON_VERSION=3.6
         - ENABLE_CONTRIB=0
         - ENABLE_HEADLESS=0
       workspaces:
         use: brew_cache
     - os: osx
-      osx_image: xcode8.3
+      osx_image: xcode9.4
       env:
         - MB_PYTHON_VERSION=3.7
         - ENABLE_CONTRIB=0
@@ -97,7 +97,7 @@ matrix:
       workspaces:
         use: brew_cache
     - os: osx
-      osx_image: xcode8.3
+      osx_image: xcode9.4
       env:
         - MB_PYTHON_VERSION=3.8
         - ENABLE_CONTRIB=0
@@ -108,31 +108,31 @@ matrix:
 
     # headless builds for MacOS
     - os: osx
-      osx_image: xcode8.3
+      osx_image: xcode9.4
       env:
         - MB_PYTHON_VERSION=2.7
         - ENABLE_CONTRIB=0
         - ENABLE_HEADLESS=1
       workspaces:
         use: brew_cache
     - os: osx
-      osx_image: xcode8.3
+      osx_image: xcode9.4
       env:
         - MB_PYTHON_VERSION=3.5
         - ENABLE_CONTRIB=0
         - ENABLE_HEADLESS=1
       workspaces:
         use: brew_cache
     - os: osx
-      osx_image: xcode8.3
+      osx_image: xcode9.4
       env:
         - MB_PYTHON_VERSION=3.6
         - ENABLE_CONTRIB=0
         - ENABLE_HEADLESS=1
       workspaces:
         use: brew_cache
     - os: osx
-      osx_image: xcode8.3
+      osx_image: xcode9.4
       env:
         - MB_PYTHON_VERSION=3.7
         - ENABLE_CONTRIB=0
@@ -141,7 +141,7 @@ matrix:
       workspaces:
         use: brew_cache
     - os: osx
-      osx_image: xcode8.3
+      osx_image: xcode9.4
       env:
         - MB_PYTHON_VERSION=3.8
         - ENABLE_CONTRIB=0
@@ -152,31 +152,31 @@ matrix:
 
     # Contrib builds for MacOS
     - os: osx
-      osx_image: xcode8.3
+      osx_image: xcode9.4
       env:
         - MB_PYTHON_VERSION=2.7
         - ENABLE_CONTRIB=1
         - ENABLE_HEADLESS=0
       workspaces:
         use: brew_cache
     - os: osx
-      osx_image: xcode8.3
+      osx_image: xcode9.4
       env:
         - MB_PYTHON_VERSION=3.5
         - ENABLE_CONTRIB=1
         - ENABLE_HEADLESS=0
       workspaces:
         use: brew_cache
     - os: osx
-      osx_image: xcode8.3
+      osx_image: xcode9.4
       env:
         - MB_PYTHON_VERSION=3.6
         - ENABLE_CONTRIB=1
         - ENABLE_HEADLESS=0
       workspaces:
         use: brew_cache
     - os: osx
-      osx_image: xcode8.3
+      osx_image: xcode9.4
       env:
         - MB_PYTHON_VERSION=3.7
         - ENABLE_CONTRIB=1
@@ -185,7 +185,7 @@ matrix:
       workspaces:
         use: brew_cache
     - os: osx
-      osx_image: xcode8.3
+      osx_image: xcode9.4
       env:
         - MB_PYTHON_VERSION=3.8
         - ENABLE_CONTRIB=1
@@ -196,31 +196,31 @@ matrix:
 
     # headless contrib builds for MacOS
     - os: osx
-      osx_image: xcode8.3
+      osx_image: xcode9.4
       env:
         - MB_PYTHON_VERSION=2.7
         - ENABLE_CONTRIB=1
         - ENABLE_HEADLESS=1
       workspaces:
         use: brew_cache
     - os: osx
-      osx_image: xcode8.3
+      osx_image: xcode9.4
       env:
         - MB_PYTHON_VERSION=3.5
         - ENABLE_CONTRIB=1
         - ENABLE_HEADLESS=1
       workspaces:
         use: brew_cache
     - os: osx
-      osx_image: xcode8.3
+      osx_image: xcode9.4
       env:
         - MB_PYTHON_VERSION=3.6
         - ENABLE_CONTRIB=1
         - ENABLE_HEADLESS=1
       workspaces:
         use: brew_cache
     - os: osx
-      osx_image: xcode8.3
+      osx_image: xcode9.4
       env:
         - MB_PYTHON_VERSION=3.7
         - ENABLE_CONTRIB=1
@@ -229,7 +229,7 @@ matrix:
       workspaces:
         use: brew_cache
     - os: osx
-      osx_image: xcode8.3
+      osx_image: xcode9.4
       env:
         - MB_PYTHON_VERSION=3.8
         - ENABLE_CONTRIB=1

setup.py

@@ -123,9 +123,12 @@ def main():
     ] + (["-DOPENCV_EXTRA_MODULES_PATH=" + os.path.abspath("opencv_contrib/modules")] if build_contrib else [])
 
     # OS-specific components
-    if (sys.platform == 'darwin' or sys.platform.startswith('linux')) and not build_headless:
+    if sys.platform.startswith('linux') and not build_headless:
         cmake_args.append("-DWITH_QT=4")
 
+    if sys.platform == 'darwin' and not build_headless:
+        cmake_args.append("-DWITH_QT=5")
+
     if build_headless:
         # it seems that cocoa cannot be disabled so on macOS the package is not truly headless
         cmake_args.append("-DWITH_WIN32UI=OFF")

travis_config.sh

@@ -96,12 +96,11 @@ function pre_build {
         brew_add_local_bottles
     fi
 
-    echo 'Installing QT4'
-    brew tap | grep -qxF cartr/qt4 || brew tap cartr/qt4
+    echo 'Installing qt5'
     if [ -n "$CACHE_STAGE" ]; then
-        brew_install_and_cache_within_time_limit cartr/qt4/qt@4 || { [ $? -gt 1 ] && return 2 || return 0; }
+        brew_install_and_cache_within_time_limit qt5 || { [ $? -gt 1 ] && return 2 || return 0; }
     else
-        brew install cartr/qt4/qt@4
+        brew install qt5
     fi
 
     echo 'Installing FFmpeg'