Merged master fixed conflict.

qgis · Feb 3, 2017 · d780ba75933ed79f787dbeced7088cea673fda81 · d780ba7
2 parents a1bdb8f + 7619cba
commit d780ba75933ed79f787dbeced7088cea673fda81
Unified Split

Showing 3,066 changed files with 52,406 additions and 93,148 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -23,6 +23,7 @@ matrix:
             - llvm-toolchain-precise-3.8
             - ubuntu-toolchain-r-test
             - george-edison55-precise-backports # doxygen 1.8.3
+            - sourceline: 'ppa:nomeata/travis-backports'
             # - laurent-boulard-devtools (for silver-search, not whitelisted yet https://github.com/travis-ci/apt-source-whitelist/pull/345)
           packages:
             - doxygen
@@ -31,7 +32,7 @@ matrix:
             - graphviz
             - libpq-dev
             - libfcgi-dev
-            - libfftw3-3	    
+            - libfftw3-3
             - pkg-config
             - perl  # lookahead regex in spell check script
             - poppler-utils
@@ -42,12 +43,13 @@ matrix:
             # used for spell checks
             # - silversearcher-ag not available in precise nor in a white listed ppa (in osgeo4travis as for now)
             - expect-dev  # unbuffer
+            - coreutils
     # OSX based build with QT4 and Python 2
     # - os: osx
     #  env:
     #    - BUILD=osx
     #    - IGNORE_BUILD_FAILURES=YES
-    
+
 
 git:
   depth: 30

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -96,7 +96,7 @@ SET (WITH_BINDINGS TRUE CACHE BOOL "Determines whether python bindings should be
 IF (WITH_BINDINGS)
   # By default bindings will be installed only to QGIS directory
   # Someone might want to install it to python site-packages directory
-  # as otherwise user has to use PYTHONPATH environemnt variable to add
+  # as otherwise user has to use PYTHONPATH environment variable to add
   # QGIS bindings to package search path
   SET (BINDINGS_GLOBAL_INSTALL FALSE CACHE BOOL "Install bindings to global python directory? (might need root)")
   SET (WITH_STAGED_PLUGINS TRUE CACHE BOOL "Stage-install core Python plugins to run from build directory? (utilities and console are always staged)")
@@ -451,7 +451,7 @@ IF (WIN32)
     SET (DEFAULT_BIN_SUBDIR bin)
     SET (DEFAULT_CGIBIN_SUBDIR bin)
     # put all the build products into a single directory
-    # under build (doesnt affect install target) to make for
+    # under build (doesn't affect install target) to make for
     # easier debugging.
 
     # Turn on defines for non standard maths stuff
@@ -569,15 +569,16 @@ IF(COMMAND cmake_policy)
   IF(NOT "${CMAKE_VERSION}" VERSION_LESS "3.3")
     cmake_policy(SET CMP0063 NEW)
   ENDIF(NOT "${CMAKE_VERSION}" VERSION_LESS "3.3")
+  IF(MSVC)
+    cmake_policy(SET CMP0020 NEW)
+  ENDIF(MSVC)
 ENDIF(COMMAND cmake_policy)
 
-IF (WIN32)
-  IF(PEDANTIC AND NOT APPLE)
-    SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
-    SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined")
-    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-undefined")
-  ENDIF(PEDANTIC AND NOT APPLE)
-ENDIF(WIN32)
+IF (PEDANTIC AND NOT WIN32 AND NOT APPLE)
+  SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
+  SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined")
+  SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-undefined")
+ENDIF(PEDANTIC AND NOT WIN32 AND NOT APPLE)
 
 SET(CMAKE_CXX_VISIBILITY_PRESET hidden)
 INCLUDE(GenerateExportHeader)

diff --git a/CONTRIBUTE.md b/CONTRIBUTE.md
@@ -13,7 +13,7 @@ by running the prepare commit script **before** issuing `git commit`.
 
 This can be automated by setting up the pre-commit hook properly.
 
-    ln -s scripts/prepare-commit.sh .git/hooks/pre-commit
+    ln -s ../../scripts/prepare-commit.sh .git/hooks/pre-commit
 
 Getting your pull request merged
 --------------------------------

diff --git a/INSTALL b/INSTALL
@@ -1,26 +1,24 @@
 QGIS
 Building QGIS from source - step by step
-Monday January 09, 2017
+Wednesday January 25, 2017
 
 
-Last Updated: Monday January 09, 2017
-Last Change : Monday January 09, 2017
+Last Updated: Wednesday January 25, 2017
+Last Change : Friday January 20, 2017
 
 
   1. Introduction
   2. Overview
   3. Building on GNU/Linux
-    3.1. Building QGIS with Qt 4.x
+    3.1. Building QGIS with Qt 5.x
     3.2. Prepare apt
     3.3. Install build dependencies
     3.4. Setup ccache (Optional)
     3.5. Prepare your development environment
     3.6. Check out the QGIS Source Code
     3.7. Starting the compile
     3.8. Building Debian packages
-    3.9. Building QGIS with Qt 5.x
-    3.10. On Debian Linux
-    3.11. On Fedora Linux
+    3.9. On Fedora Linux
   4. Building on Windows
     4.1. Building with Microsoft Visual Studio
     4.2. Building using MinGW
@@ -139,13 +137,13 @@ those formats in GDAL.
   ========================
 
 
-  3.1. Building QGIS with Qt 4.x
+  3.1. Building QGIS with Qt 5.x
   ==============================
 
 Requires: Ubuntu / Debian derived distro
 
 /!\ Note: Refer to the section Building Debian packages for building
-debian packages.  Unless you plan to develop on QGIS, that is probably the
+debian packages. Unless you plan to develop on QGIS, that is probably the
 easiest option to compile and install QGIS.
 
 These notes are for Ubuntu - other versions and Debian derived distros may
@@ -263,6 +261,11 @@ be pressed several times before the 'g' option becomes available.
 After the 'g' generation is complete, press 'q' to exit the ccmake
 interactive dialog.
 
+/!\ Warning: Make sure that your build directory is completely empty when you 
+enter the command. Do never try to "re-use" an existing Qt4 build directory.
+If you want to use `ccmake` or other interactive tools, run the command in
+the empty build directory once before starting to use the interactive tools.
+
 Now on with the build:
 
   make -jX
@@ -349,56 +352,15 @@ Install them using dpkg.  E.g.:
   sudo debi
 
 
-  3.9. Building QGIS with Qt 5.x
-  ==============================
-
-/!\ Warning: Qt 5 is not officially supported. Building against Qt 5
-libraries seems to work quite well already but be prepared that you are one
-of very few with this setup. We strongly recommend using QGIS with Qt 4 for
-production work.
-
-Python bindings in particular are not expected to be compatible. When Qt 5
-is enabled, the build system automatically activates Python 3 and PyQt5 as well.
-There are no plugins and not even the python code shipped along the QGIS source
-code is compatible with PyQt5.
-
-You have been warned.
-
-
-  3.10. On Debian Linux
-  =====================
-
-We assume that you have the source code of QGIS ready and created a new
-subdirectory called `build` or `build-qt5` in it.
-
-
-    3.10.1. Install build dependencies
-    ==================================
-
-  apt-get install git build-essential cmake flex bison pyqt5-dev qttools5-dev qtpositioning5-dev libqt5svg5-dev libqt5webkit5-dev  libqt5gui5 libqt5scripttools5 qtscript5-dev libqca-qt5-2-dev grass-dev libgeos-dev libgdal-dev libqt5xmlpatterns5-dev libqt5scintilla2-dev pyqt5.qsci-dev python3-pyqt5.qsci libgsl-dev txt2tags libproj-dev libqwt-qt5-dev libspatialindex-dev pyqt5-dev-tools qttools5-dev-tools qt5-default python3-future python3-pyqt5.qtsql python3-psycopg2 python3-sip-dev
-
-Make sure that your build directory is completely empty when you enter the
-following command. Do never try to "re-use" an existing Qt4 build directory.
-If you want to use `ccmake` or other interactive tools, run the following
-command in the empty build directory once before starting to use the
-interactive tools.
-
-  cmake
-
-If everything went ok you can finally start to compile. (As usual append a -jX where X is the number of available cores option to make to speed up your build process)
-
-  make
-
-
-  3.11. On Fedora Linux
-  =====================
+  3.9. On Fedora Linux
+  ====================
 
 We assume that you have the source code of QGIS ready and created a
 new subdirectory called `build` or `build-qt5` in it.
 
 
-    3.11.1. Install build dependencies
-    ==================================
+    3.9.1. Install build dependencies
+    =================================
 
   dnf install qt5-qtwebkit-devel qt5-qtlocation-devel qt5-qttools-static
   qt5-qtscript-devel qca-qt5-devel python3-qt5-devel python3-qscintilla-qt5-devel 
@@ -753,7 +715,7 @@ to get versions that match your current Qt installed version.
       ===========================
 
 /!\ You can delete the directories with unpacked SIP and PyQt4 sources after a
-successfull install, they're not needed anymore.
+successful install, they're not needed anymore.
 
 
     4.2.5. git