Travis CI: QT5 added

Author: arummler

.travis/before_install.sh

@@ -20,7 +20,7 @@ if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
 	echo "Installing cmake now"
 	wget ${CMAKE_DOWNLOAD_PATH}/$CMAKE_FILENAME
 	tar xfz $CMAKE_FILENAME
-	export PATH="`pwd`/${CMAKE_FILENAME%%.*}/CMake.app/Contents/bin":$PATH:	
+	export PATH="`pwd`/${CMAKE_FILENAME%%.tar.gz}/CMake.app/Contents/bin":$PATH:	
 	echo $PATH
 
 	# OS X: update brew cache:

.travis/install.sh

@@ -1,15 +1,33 @@
 #!/bin/bash
 
 if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
-  # Install package dependencies for Mac OS X:
-   brew unlink cmake
-   brew install python libusb qt
-  # Install numpy via pip:
-   easy_install pip
-   pip install numpy
+	if [[ $OPTION == 'modern' ]]; then
+		# Install package dependencies for Mac OS X:
+		brew unlink cmake
+		brew install python libusb qt5
+		export CMAKE_PREFIX_PATH=/usr/local/opt/qt5
+		# Install numpy via pip:
+		easy_install pip
+		pip install numpy
+	else
+		# Install package dependencies for Mac OS X:
+		brew unlink cmake
+		brew install python libusb qt
+		# Install numpy via pip:
+		easy_install pip
+		pip install numpy	
+	fi
+	
 else 
-  # Install package dependencies for Linux:
-  sudo apt-get install -y libusb-1.0-0 libusb-1.0-0-dev python2.7 python-numpy cmake qt4-dev-tools
+
+	if [[ $OPTION == 'modern' ]]; then
+		# Install package dependencies for Linux:
+		sudo apt-get install -y libusb-1.0-0 libusb-1.0-0-dev python2.7 python-numpy cmake qt5-default	
+	else
+		# Install package dependencies for Linux:
+		sudo apt-get install -y libusb-1.0-0 libusb-1.0-0-dev python2.7 python-numpy cmake qt4-dev-tools
+	fi
+	
 fi