Merge remote-tracking branch 'upstream/master' into cmake_qt5

.travis.yml

@@ -1,9 +1,10 @@
 language: cpp
+os:
+  - linux
+  - osx
 compiler:
   - gcc
   - clang
 script: mkdir build && cd build && cmake .. && make
-before_install:
+install: ./travis-dependencies.sh
-  - sudo apt-get update -qq
-  - sudo apt-get install -y qtmobility-dev libprotobuf-dev protobuf-compiler libqt4-dev build-essential
 cache: apt

travis-dependencies.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+if [[ $TRAVIS_OS_NAME == "osx" ]] ; then
+  brew update
+  brew install qt cmake protobuf
+else
+  sudo apt-get update -qq
+  sudo apt-get install -y qtmobility-dev libprotobuf-dev protobuf-compiler libqt4-dev
+fi