From a0a375eaa1261ea71d78c12297f4905f9ff577bc Mon Sep 17 00:00:00 2001
From: Ryan Flynn <parseerror+github@gmail.com>
Date: Tue, 3 Jan 2017 22:13:33 -0500
Subject: [PATCH] fix OSX+qt4

---
 .travis.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0c26f441..aa2665f2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -146,9 +146,9 @@ matrix:
         - make qt5py3
         - xvfb-run make testpy3
 
-    # OS X 10.12 Python 2 + QT4
+    # OS X 10.10 Python 2 + QT4
     - os: osx
-      osx_image: xcode8.2  # OS X 10.12
+      osx_image: xcode6.4  # OS X 10.10
       sudo: required
       language: generic
       python: "2.7"
@@ -157,19 +157,19 @@ matrix:
       before_install:
         - brew install libxml2
         - brew install cartr/qt4/qt
+        - brew linkapps qt
         - which python pip
         - python --version
         - sudo -H easy_install-2.7 lxml || true
         - python -c 'import sys; print(sys.path)'
         - python -c 'import lxml'
         - make qt4py2
-        - python3 -c 'help("modules")'
-        #- make testpy2  # FIXME: does not work, segfault on travis-ci
-        - ( python labelImg.py ) & sleep 10; kill $!
+        - python -c 'help("modules")'
+        - make testpy2
 
-    # OS X 10.12 Python 3 + QT4
+    # OS X 10.10 Python 3 + QT4
     - os: osx
-      osx_image: xcode8.2  # OS X 10.12
+      osx_image: xcode6.4  # OS X 10.10
       sudo: required
       language: generic
       python: "3.6"
@@ -178,6 +178,7 @@ matrix:
       before_install:
         - brew install libxml2
         - brew install cartr/qt4/qt
+        - brew linkapps qt
         - which python3 pip3
         - python3 --version
         - sudo -H easy_install-3.6 lxml || true
@@ -185,8 +186,7 @@ matrix:
         - python3 -c 'import lxml'
         - make qt4py3
         - python3 -c 'help("modules")'
-        #- make testpy3  # FIXME: does not work, segfault on travis-ci
-        - ( python3 labelImg.py ) & sleep 10; kill $!
+        - make testpy3
 
     # OS X 10.10 Python 3 + QT5
     - os: osx