.editorconfig

+# See http://editorconfig.org
+
+# top-most EditorConfig file
+root = true
+
+# every file needs these
+[*]
+charset = utf-8
+end_of_line = lf
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+
+# python scripts have 4 spaces indent
+[*.py]
+indent_size = 4

.gitignore

@@ -61,4 +61,6 @@ tests/testdata/raster/band1_float32_noct_epsg4326.tif.aux.xml
 tests/testdata/raster/band1_int16_noct_epsg4326.tif.aux.xml
 tests/testdata/raster/band3_float32_noct_epsg4326.tif.aux.xml
 tests/testdata/raster/band3_int16_noct_epsg4326.tif.aux.xml
+python/plugins/processing/tests/testdata/custom/grass7/float_raster.tif.aux.xml
+python/plugins/processing/tests/testdata/custom/grass7/raster_1class.tif.aux.xml
 Thumb.db

.travis.yml

-language: cpp
-
 matrix:
+  fast_finish: true
   allow_failures:
     - os: osx
   include:
+    # QT4 based build with Python 2.7 // using container based builds and prebuild binary dependencies in osgeo4travis
     - os: linux
-      sudo: required
+      language: cpp
+      env:
+        - BUILD=qt4
+        - QT_VERSION=4
+#        - LLVM_VERSION=3.8
       dist: precise
-      group: legacy
-      compiler: clang
+      sudo: false
+      cache:
+        apt: true
+        directories:
+          - $HOME/.ccache
+      compiler: gcc
+      addons:
+        postgresql: "9.4"
+        apt:
+          sources:
+#            - llvm-toolchain-precise-3.8
+            - ubuntu-toolchain-r-test
+            - george-edison55-precise-backports # doxygen 1.8.3
+          packages:
+            - bison
+            - gcc-6
+            - g++-6
+            - doxygen
+            - flex
+            - flip
+            - libfcgi-dev
+            - libfftw3-3
+            - libpq-dev
+            - libqscintilla2-dev
+            - libqt4-dev
+            - libqt4-opengl-dev
+            - libqt4-sql-sqlite
+            - libqtwebkit-dev
+            - libqwt-dev
+            - libspatialindex-dev
+            - libspatialite-dev
+            - libsqlite3-dev
+            - pkg-config
+            - poppler-utils
+            - pyqt4-dev-tools
+            - python
+            - python-dev
+            - python-numpy
+            - python-pip
+            - python-psycopg2
+            - python-qscintilla2
+            - python-qt4-dev
+            - python-qt4-sql
+            - python-sip
+            - python-sip-dev
+            - txt2tags
+            - xvfb
+    # OSX based build with QT4 and Python 2
     - os: osx
-      compiler: clang
-
+      env:
+        - BUILD=osx
+        - IGNORE_BUILD_FAILURES=YES
 
 git:
   depth: 30
 
-cache: apt
-
 notifications:
   irc: "chat.freenode.net#qgis-test"
   on_failure: change
@@ -32,9 +81,6 @@ notifications:
     on_failure: always # options: [always|never|change] default: always
     on_start: never # default: never
 
-addons:
-  postgresql: "9.1"
-
 before_install:
   - ./ci/travis/${TRAVIS_OS_NAME}/before_install.sh
 

CMakeLists.txt

 SET(CPACK_PACKAGE_VERSION_MAJOR "2")
 SET(CPACK_PACKAGE_VERSION_MINOR "14")
-SET(CPACK_PACKAGE_VERSION_PATCH "3")
+SET(CPACK_PACKAGE_VERSION_PATCH "22")
 SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
 SET(RELEASE_NAME "Essen")
 IF (POLICY CMP0048) # in CMake 3.0.0+
@@ -150,6 +150,11 @@ IF (MSVC AND CMAKE_GENERATOR MATCHES "NMake")
   SET (USING_NMAKE TRUE)
 ENDIF (MSVC AND CMAKE_GENERATOR MATCHES "NMake")
 
+IF (CMAKE_GENERATOR MATCHES "Ninja")
+  # following variable is also used in qgsconfig.h
+  SET (USING_NINJA TRUE)
+ENDIF (CMAKE_GENERATOR MATCHES "Ninja")
+
 #############################################################
 # check if lexer and parser are not missing
 # http://www.mail-archive.com/cmake@cmake.org/msg02861.html
@@ -393,9 +398,9 @@ IF (PEDANTIC)
   MESSAGE (STATUS "Pedantic compiler settings enabled")
   IF(MSVC)
     SET(_warnings "")
-    IF (NOT USING_NMAKE)
+    IF (NOT USING_NMAKE AND NOT USING_NINJA)
       SET(_warnings "${_warnings} /W4" )
-    ENDIF (NOT USING_NMAKE)
+    ENDIF (NOT USING_NMAKE AND NOT USING_NINJA)
 
     # disable warnings
     SET(_warnings "${_warnings} /wd4100 ")  # unused formal parameters
@@ -502,10 +507,10 @@ IF (WIN32)
     ADD_DEFINITIONS(-D_CRT_NONSTDC_NO_WARNINGS)
 
     IF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
-      IF (NOT USING_NMAKE)
+      IF (NOT USING_NMAKE AND NOT USING_NINJA)
         MESSAGE (STATUS "Generating browse files")
         ADD_DEFINITIONS( /FR )
-      ENDIF (NOT USING_NMAKE)
+      ENDIF (NOT USING_NMAKE AND NOT USING_NINJA)
     ENDIF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
 
     IF (INSTALL_DEPS)
@@ -740,9 +745,15 @@ IF (EXISTS ${CMAKE_SOURCE_DIR}/.git/index)
   FIND_PROGRAM(GITCOMMAND git PATHS c:/cygwin/bin)
   IF(GITCOMMAND)
     IF(WIN32)
+      IF(USING_NINJA)
+       SET(ARG %a)
+      ELSE(USING_NINJA)
+       SET(ARG %%a)
+      ENDIF(USING_NINJA)
       ADD_CUSTOM_COMMAND(
-        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h
-        COMMAND for /f \"usebackq tokens=1\" %%a in "(`\"${GITCOMMAND}\" log -n1 --oneline`)" do echo \#define QGSVERSION \"%%a\" >${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h.temp
+        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.inc
+        COMMAND for /f \"usebackq tokens=1\" ${ARG} in "(`\"${GITCOMMAND}\" log -n1 --oneline`)" do echo \#define QGSVERSION \"${ARG}\" >${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h.temp
+        COMMAND for /f \"usebackq tokens=1\" ${ARG} in "(`\"${GITCOMMAND}\" log -n1 --oneline`)" do echo PROJECT_NUMBER = \"${COMPLETE_VERSION}-${RELEASE_NAME} \(${ARG}\)\" >${CMAKE_CURRENT_BINARY_DIR}/qgsversion.inc
         COMMAND ${CMAKE_COMMAND} -DSRC=${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h.temp -DDST=${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h -P ${CMAKE_SOURCE_DIR}/cmake/CopyIfChanged.cmake
         MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/.git/index
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}

CTestConfig.cmake

@@ -7,7 +7,7 @@
 set(CTEST_PROJECT_NAME "QGIS")
 set(CTEST_NIGHTLY_START_TIME "20:00:00 CEST")
 
-set(CTEST_DROP_METHOD "http")
+set(CTEST_DROP_METHOD "https")
 set(CTEST_DROP_SITE "dash.orfeo-toolbox.org")
 set(CTEST_DROP_LOCATION "/submit.php?project=QGIS")
 set(CTEST_DROP_SITE_CDASH TRUE)

NEWS

 QGIS News
 Change history for the QGIS Project
-Thursday February 25, 2016
+Saturday October 08, 2016
 
 
 ------------------------------------------------------------------------
@@ -38,8 +38,8 @@ Thursday February 25, 2016
 ------------------------------------------------------------------------
 
 
-Last Updated: Thursday February 25, 2016
-Last Change : Thursday February 25, 2016
+Last Updated: Saturday October 08, 2016
+Last Change : Saturday October 01, 2016
 
 
   1. What's new in Version 2.14 'Essen'?
@@ -101,7 +101,7 @@ This release has following new features:
 - QGIS Server : STARTINDEX param in WFS GetFeature Request
 - QGIS Server : showFeatureCount in GetLegendGraphic
 - QGIS Server : Enhance store project keyword list
-- QGIS Server : Option to avoid rendering artefacts at edges of tiles
+- QGIS Server : Option to avoid rendering artifacts at edges of tiles
 - QGIS Server : WMS INSPIRE Capabilities
 - QGIS Server : Configuration checker in project properties
 - QGIS Server : Add short name to layers, groups and project

ci/travis/linux/after_script.sh

+###########################################################################
+#    after_script.sh
+#    ---------------------
+#    Date                 : September 2015
+#    Copyright            : (C) 2015 by Matthias Kuhn
+#    Email                : matthias at opengis dot ch
+###########################################################################
+#                                                                         #
+#   This program is free software; you can redistribute it and/or modify  #
+#   it under the terms of the GNU General Public License as published by  #
+#   the Free Software Foundation; either version 2 of the License, or     #
+#   (at your option) any later version.                                   #
+#                                                                         #
+###########################################################################
+
 [ -r /tmp/ctest-important.log ] && cat /tmp/ctest-important.log

ci/travis/linux/before_install.sh

-export DEBIAN_FRONTEND=noninteractive
+#!/bin/bash
+###########################################################################
+#    before_install.sh
+#    ---------------------
+#    Date                 : August 2015
+#    Copyright            : (C) 2015 by Nyall Dawson
+#    Email                : nyall dot dawson at gmail dot com
+###########################################################################
+#                                                                         #
+#   This program is free software; you can redistribute it and/or modify  #
+#   it under the terms of the GNU General Public License as published by  #
+#   the Free Software Foundation; either version 2 of the License, or     #
+#   (at your option) any later version.                                   #
+#                                                                         #
+###########################################################################
 
-sudo add-apt-repository ppa:ubuntugis/ppa -y
-sudo add-apt-repository ppa:ubuntugis/ubuntugis-unstable -y # For postgresql-9.1-postgis-2.1
-sudo add-apt-repository ppa:smspillaz/cmake-3.0.2 -y
-sudo add-apt-repository ppa:kedazo/doxygen-updates-precise -y # For doxygen 1.8.8
-sudo apt-get update -qq
-sudo apt-get install --force-yes --no-install-recommends --no-install-suggests \
-        bison \
-        cmake \
-        cmake-data \
-        doxygen \
-        flex \
-        gdal-bin \
-        git \
-        graphviz \
-        grass-dev \
-        libexpat1-dev \
-        libfcgi-dev \
-        libgdal1-dev \
-        libgeos-dev \
-        libgsl0-dev \
-        libpq-dev \
-        libproj-dev \
-        libqca2-dev \
-        libqca2-plugin-ossl \
-        libqscintilla2-dev \
-        libqt4-dev \
-        libqt4-opengl-dev \
-        libqt4-sql-sqlite \
-        libqtwebkit-dev \
-        libqwt-dev \
-        libspatialindex-dev \
-        libspatialite-dev \
-        libsqlite3-dev \
-        lighttpd \
-        pkg-config \
-        poppler-utils \
-        pyqt4-dev-tools \
-        python \
-        python-dev \
-        python-qt4 \
-        python-qt4-dev \
-        python-qt4-sql \
-        python-qscintilla2 \
-        python-sip \
-        python-sip-dev \
-        python-psycopg2 \
-        python-numpy \
-        python-gdal \
-        spawn-fcgi \
-        txt2tags \
-        xauth \
-        xfonts-100dpi \
-        xfonts-75dpi \
-        xfonts-base \
-        xfonts-scalable \
-        xvfb \
-        python-pip \
-        flip \
-        jq \
-        postgresql-9.1-postgis-2.1/precise # from ubuntugis-unstable, not pgdg
 
-sudo -H pip install autopep8 # TODO when switching to trusty or above: replace python-pip with python-autopep8
-sudo -H pip install nose2 pyyaml mock
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+${DIR}/qt${QT_VERSION}/before_install.sh

ci/travis/linux/before_script.sh

+###########################################################################
+#    before_script.sh
+#    ---------------------
+#    Date                 : August 2015
+#    Copyright            : (C) 2015 by Nyall Dawson
+#    Email                : nyall dot dawson at gmail dot com
+###########################################################################
+#                                                                         #
+#   This program is free software; you can redistribute it and/or modify  #
+#   it under the terms of the GNU General Public License as published by  #
+#   the Free Software Foundation; either version 2 of the License, or     #
+#   (at your option) any later version.                                   #
+#                                                                         #
+###########################################################################
+
 printf "[qgis_test]\nhost=localhost\ndbname=qgis_test\nuser=postgres" > ~/.pg_service.conf
 
 export PGUSER=postgres

ci/travis/linux/install.sh

-mkdir build
-cd build
+#!/bin/bash
+###########################################################################
+#    install.sh
+#    ---------------------
+#    Date                 : August 2015
+#    Copyright            : (C) 2015 by Nyall Dawson
+#    Email                : nyall dot dawson at gmail dot com
+###########################################################################
+#                                                                         #
+#   This program is free software; you can redistribute it and/or modify  #
+#   it under the terms of the GNU General Public License as published by  #
+#   the Free Software Foundation; either version 2 of the License, or     #
+#   (at your option) any later version.                                   #
+#                                                                         #
+###########################################################################
 
-CLANG_WARNINGS="-Wimplicit-fallthrough"
 
-cmake -DWITH_SERVER=ON \
-      -DWITH_STAGED_PLUGINS=ON \
-      -DWITH_GRASS=ON \
-      -DSUPPRESS_QT_WARNINGS=ON \
-      -DENABLE_MODELTEST=ON \
-      -DENABLE_PGTEST=ON \
-      -DWITH_QWTPOLAR=OFF \
-      -DWITH_APIDOC=ON \
-      -DWITH_ASTYLE=ON \
-      -DWITH_PYSPATIALITE=ON \
-      -DGRASS_PREFIX7=/usr/lib/grass70 \
-      -DGRASS_INCLUDE_DIR7=/usr/lib/grass70/include \
-      -DCXX_EXTRA_FLAGS="$CLANG_WARNINGS" \
-      ..
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+${DIR}/qt${QT_VERSION}/install.sh

ci/travis/linux/qt4/before_install.sh

+###########################################################################
+#    before_install.sh
+#    ---------------------
+#    Date                 : March 2016
+#    Copyright            : (C) 2016 by Matthias Kuhn
+#    Email                : matthias at opengis dot ch
+###########################################################################
+#                                                                         #
+#   This program is free software; you can redistribute it and/or modify  #
+#   it under the terms of the GNU General Public License as published by  #
+#   the Free Software Foundation; either version 2 of the License, or     #
+#   (at your option) any later version.                                   #
+#                                                                         #
+###########################################################################
+
+export DEBIAN_FRONTEND=noninteractive
+
+pushd ${HOME}
+
+curl -L https://github.com/opengisch/osgeo4travis/archive/qt4bin.tar.gz | tar -xzC /home/travis --strip-components=1
+curl -L https://cmake.org/files/v3.5/cmake-3.5.0-Linux-x86_64.tar.gz | tar --strip-components=1 -zxC /home/travis/osgeo4travis
+
+popd
+pip install --user autopep8 nose2 pyyaml mock future

ci/travis/linux/qt4/install.sh

+###########################################################################
+#    install.sh
+#    ---------------------
+#    Date                 : March 2016
+#    Copyright            : (C) 2016 by Matthias Kuhn
+#    Email                : matthias at opengis dot ch
+###########################################################################
+#                                                                         #
+#   This program is free software; you can redistribute it and/or modify  #
+#   it under the terms of the GNU General Public License as published by  #
+#   the Free Software Foundation; either version 2 of the License, or     #
+#   (at your option) any later version.                                   #
+#                                                                         #
+###########################################################################
+
+mkdir build
+cd build
+
+ln -s ${HOME}/osgeo4travis/bin/ccache ${HOME}/osgeo4travis/bin/clang++-${LLVM_VERSION}
+ln -s ${HOME}/osgeo4travis/bin/ccache ${HOME}/osgeo4travis/bin/clang-${LLVM_VERSION}
+ln -s ${HOME}/osgeo4travis/bin/ccache ${HOME}/osgeo4travis/bin/g++-6
+ln -s ${HOME}/osgeo4travis/bin/ccache ${HOME}/osgeo4travis/bin/gcc-6
+
+ccache -s
+
+#export CXX="clang++-${LLVM_VERSION}"
+#export CC="clang-${LLVM_VERSION}"
+export CXX="g++-6"
+export CC="gcc-6"
+
+export PATH=${HOME}/osgeo4travis/bin:${PATH}
+
+cmake --version
+${CC} --version
+${CXX} --version
+
+# CLANG_WARNINGS="-Wimplicit-fallthrough"
+CLANG_WARNINGS=""
+
+# Include this line for debug reasons
+#      -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+#
+cmake \
+      -DCMAKE_PREFIX_PATH=/home/travis/osgeo4travis \
+      -DWITH_STAGED_PLUGINS=ON \
+      -DWITH_GRASS=ON \
+      -DSUPPRESS_QT_WARNINGS=ON \
+      -DENABLE_MODELTEST=ON \
+      -DENABLE_PGTEST=ON \
+      -DWITH_QSPATIALITE=ON \
+      -DWITH_QWTPOLAR=OFF \
+      -DWITH_APIDOC=ON \
+      -DWITH_ASTYLE=ON \
+      -DWITH_SERVER=ON \
+      -DWITH_PYSPATIALITE=ON \
+      -DGRASS_PREFIX7=/usr/lib/grass70 \
+      -DGRASS_INCLUDE_DIR7=/usr/lib/grass70/include \
+      -DCXX_EXTRA_FLAGS="$CLANG_WARNINGS" \
+      ..

ci/travis/linux/qt4/script.sh

+###########################################################################
+#    script.sh
+#    ---------------------
+#    Date                 : March 2016
+#    Copyright            : (C) 2016 by Matthias Kuhn
+#    Email                : matthias at opengis dot ch
+###########################################################################
+#                                                                         #
+#   This program is free software; you can redistribute it and/or modify  #
+#   it under the terms of the GNU General Public License as published by  #
+#   the Free Software Foundation; either version 2 of the License, or     #
+#   (at your option) any later version.                                   #
+#                                                                         #
+###########################################################################
+
+export PYTHONPATH=${HOME}/osgeo4travis/lib/python2.7/site-packages/
+export PATH=${HOME}/osgeo4travis/bin:${HOME}/osgeo4travis/sbin:${PATH}
+export LD_LIBRARY_PATH=${HOME}/osgeo4travis/lib
+export CTEST_PARALLEL_LEVEL=1
+export CCACHE_CPP2=yes
+export CCACHE_TEMPDIR=/tmp
+if [ "${TRAVIS_PULL_REQUEST}" != "false" ]; then
+  export CCACHE_READONLY=yes
+  chmod -R ugo-w ~/.ccache
+fi
+
+xvfb-run ctest -V -E 'qgis_filedownloader|qgis_openstreetmaptest|qgis_wcsprovidertest|qgis_ziplayertest' -S ./qgis-test-travis.ctest --output-on-failure

ci/travis/linux/script.sh

-xvfb-run ctest -V -E 'qgis_openstreetmaptest|qgis_wcsprovidertest' -S ./qgis-test-travis.ctest --output-on-failure
+#!/bin/bash
+###########################################################################
+#    script.sh
+#    ---------------------
+#    Date                 : August 2015
+#    Copyright            : (C) 2015 by Nyall Dawson
+#    Email                : nyall dot dawson at gmail dot com
+###########################################################################
+#                                                                         #
+#   This program is free software; you can redistribute it and/or modify  #
+#   it under the terms of the GNU General Public License as published by  #
+#   the Free Software Foundation; either version 2 of the License, or     #
+#   (at your option) any later version.                                   #
+#                                                                         #
+###########################################################################
+
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+${DIR}/qt${QT_VERSION}/script.sh

ci/travis/osx/before_install.sh

+###########################################################################
+#    before_install.sh
+#    ---------------------
+#    Date                 : August 2015
+#    Copyright            : (C) 2015 by Nyall Dawson
+#    Email                : nyall dot dawson at gmail dot com
+###########################################################################
+#                                                                         #
+#   This program is free software; you can redistribute it and/or modify  #
+#   it under the terms of the GNU General Public License as published by  #
+#   the Free Software Foundation; either version 2 of the License, or     #
+#   (at your option) any later version.                                   #
+#                                                                         #
+###########################################################################
+
+# Remove default gdal provided by travis  (we will replace it with gdal 2)
+brew remove gdal || true
+
 brew tap osgeo/osgeo4mac
 brew update
-brew install osgeo/osgeo4mac/qgis-28 --without-postgis --without-postgresql --without-grass --without-gpsbabel --only-dependencies
-brew install qca
+brew install osgeo/osgeo4mac/qgis-214 --without-postgresql --only-dependencies
 brew install spawn-fcgi
 brew install lighttpd
 brew install poppler
@@ -14,8 +31,9 @@ brew ln libxml2 --force
 brew ln gettext --force
 brew ln libffi --force
 
-mkdir -p /Users/travis/Library/Python/2.7/lib/python/site-packages
-echo 'import site; site.addsitedir("/usr/local/lib/python2.7/site-packages")' >> /Users/travis/Library/Python/2.7/lib/python/site-packages/homebrew.pth
+mkdir -p ${HOME}/Library/Python/2.7/lib/python/site-packages
+echo 'import site; site.addsitedir("/usr/local/lib/python2.7/site-packages")' >> ${HOME}/Library/Python/2.7/lib/python/site-packages/homebrew.pth
+echo 'import site; site.addsitedir("/usr/local/opt/gdal-20/lib/python2.7/site-packages")' >> ${HOME}/Library/Python/2.7/lib/python/site-packages/gdal2.pth
 
 # Needed for Processing
-pip install psycopg2 numpy nose2 pyyaml mock
+pip install psycopg2 numpy nose2 pyyaml mock future

ci/travis/osx/install.sh

+###########################################################################
+#    install.sh
+#    ---------------------
+#    Date                 : August 2015
+#    Copyright            : (C) 2015 by Nyall Dawson
+#    Email                : nyall dot dawson at gmail dot com
+###########################################################################
+#                                                                         #
+#   This program is free software; you can redistribute it and/or modify  #
+#   it under the terms of the GNU General Public License as published by  #
+#   the Free Software Foundation; either version 2 of the License, or     #
+#   (at your option) any later version.                                   #
+#                                                                         #
+###########################################################################
+
 mkdir build
 cd build
 #no PGTEST for OSX - can't get postgres to start with brew install
 #no APIDOC for OSX - doxygen tests and warnings are covered by linux build
 #no deprecated-declarations warnings... requires QGIS ported to Cocoa
-cmake -DWITH_SERVER=ON -DWITH_STAGED_PLUGINS=ON -DWITH_GRASS=OFF \
-          -DSUPPRESS_QT_WARNINGS=ON -DENABLE_MODELTEST=ON -DENABLE_PGTEST=OFF \
-          -DWITH_QWTPOLAR=OFF -DWITH_PYSPATIALITE=ON \
+cmake \
+  -DWITH_SERVER=ON \
+  -DWITH_STAGED_PLUGINS=ON \
+  -DWITH_GRASS=OFF \
+  -DSUPPRESS_SIP_WARNINGS=ON \
+  -DSUPPRESS_QT_WARNINGS=ON \
+  -DENABLE_MODELTEST=ON \
+  -DENABLE_PGTEST=OFF \
+  -DWITH_QWTPOLAR=OFF \
+  -DWITH_PYSPATIALITE=ON \
   -DQWT_INCLUDE_DIR=/usr/local/opt/qwt/lib/qwt.framework/Headers/ \
   -DQWT_LIBRARY=/usr/local/opt/qwt/lib/qwt.framework/qwt \
-          -DCMAKE_CXX_FLAGS="-Wno-deprecated-declarations" ..
+  -DGDAL_CONFIG=/usr/local/opt/gdal-20/bin/gdal-config \
+  -DGRASS_PREFIX7=/usr/local/opt/grass-70/grass-7.0.4 \
+  -DCMAKE_CXX_FLAGS="-Wno-deprecated-declarations" \
+  ..

ci/travis/osx/script.sh

-ctest -V -E 'qgis_openstreetmaptest|qgis_wcsprovidertest|PyQgsServer' -S ./qgis-test-travis.ctest --output-on-failure
+###########################################################################
+#    script.sh
+#    ---------------------
+#    Date                 : August 2015
+#    Copyright            : (C) 2015 by Nyall Dawson
+#    Email                : nyall dot dawson at gmail dot com
+###########################################################################
+#                                                                         #
+#   This program is free software; you can redistribute it and/or modify  #
+#   it under the terms of the GNU General Public License as published by  #
+#   the Free Software Foundation; either version 2 of the License, or     #
+#   (at your option) any later version.                                   #
+#                                                                         #
+###########################################################################
+
+echo $PATH
+
+export PATH=/usr/bin:${PATH}
+
+ctest -V -E 'qgis_openstreetmaptest|qgis_wcsprovidertest|PyQgsServer|ProcessingGdalAlgorithmsTest|PyQgsOfflineEditingWFS|ProcessingGrass7AlgorithmsImageryTest|ProcessingGrass7AlgorithmsRasterTest|qgis_composerhtmltest' -S ./qgis-test-travis.ctest --output-on-failure
 

cmake/FindQScintilla.cmake

@@ -34,9 +34,9 @@ ELSE(EXISTS QSCINTILLA_VERSION_STR)
     )
 
   if(ENABLE_QT5)
-    set(QSCINTILLA_LIBRARY_NAMES qscintilla2-qt5 libqscintilla2-qt5 qt5scintilla2 libqscintilla2-qt5.dylib)
+    set(QSCINTILLA_LIBRARY_NAMES qscintilla2-qt5 qscintilla2_qt5 libqt5scintilla2 libqscintilla2-qt5 qt5scintilla2 libqscintilla2-qt5.dylib)
   else(ENABLE_QT5)
-    set(QSCINTILLA_LIBRARY_NAMES qscintilla2 libqscintilla2 libqscintilla2.dylib)
+    set(QSCINTILLA_LIBRARY_NAMES qscintilla2 qscintilla2_qt4 libqscintilla2 libqscintilla2.dylib)
   endif(ENABLE_QT5)
 
   find_library(QSCINTILLA_LIBRARY

cmake/FindSPATIALITE.cmake

@@ -47,7 +47,8 @@ FIND_PATH(SPATIALITE_INCLUDE_DIR spatialite.h
   "$ENV{LIB_DIR}/include/spatialite"
   )
 
-FIND_LIBRARY(SPATIALITE_LIBRARY NAMES spatialite spatialite_i PATHS
+FIND_LIBRARY(SPATIALITE_LIBRARY NAMES spatialite_i spatialite PATHS
+  /usr/lib
   $ENV{LIB}
   $ENV{LIB_DIR}/lib
   )