diff --git a/.travis.yml b/.travis.yml
index 88652bfefbc6..1a24b9f4ca03 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ notifications:
urls:
- https://webhooks.gitter.im/e/5d0244ab020a75bf7d17
on_success: change # options: [always|never|change] default: always
- on_failure: always # options: [always|never|change] default: always
+ on_failure: change # options: [always|never|change] default: always
on_start: never # default: never
addons:
diff --git a/INSTALL b/INSTALL
index 62805284a43a..3367d0d5c330 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,10 +1,10 @@
QGIS
Building QGIS from source - step by step
-Thursday March 19, 2015
+Monday June 15, 2015
-Last Updated: Thursday March 19, 2015
-Last Change : Thursday March 19, 2015
+Last Updated: Monday June 15, 2015
+Last Change : Monday June 15, 2015
1. Introduction
@@ -109,9 +109,9 @@ Required build dependencies:
Optional dependencies:
- for GRASS providers and plugin - GRASS >= 6.0.0. QGIS may be compiled with GRASS 6 or GRASS 7.
- It can also be compiled with both GRASS versions in a single build but only if QGIS
- is not installed with rpath. The desired GRASS version is choosen on runtime by setting
- LD_LIBRARY_PATH or PATH.
+ It can also be compiled with both GRASS versions in a single build but only if QGIS
+ is not installed with rpath. The desired GRASS version is choosen on runtime by setting
+ LD_LIBRARY_PATH or PATH.
- for georeferencer - GSL >= 1.8
- for postgis support and SPIT plugin - PostgreSQL >= 8.0.x
- for gps plugin - gpsbabel
@@ -566,7 +566,7 @@ the windows system preferences.
If you plan to do some debugging, you'll need to compile debug version of Qt:
C:\Qt\4.8.0\bin\qtvars.bat compile_debug
-Note: there is a problem when compiling debug version of Qt 4.8, the script ends with
+Note: there is a problem when compiling debug version of Qt 4.7, the script ends with
this message "mingw32-make: *** No rule to make target `debug'. Stop.". To
compile the debug version you have to go out of src directory and execute the
following command:
@@ -1036,7 +1036,7 @@ Snow Leopard+ note: If you are building on Snow Leopard+, you will need to
decide between 32-bit support in the older Qt Carbon branch, or 64-bit
support in the Qt Cocoa branch. Appropriate installers are available for both
as of Qt-4.5.2, though they stopped making Carbon packages at Qt 4.7.4.
-
+Qt 4.6+ is recommended for Cocoa.
Starting with Lion, Carbon may not work properly, if at all.
Starting with Qt 4.8, only 64bit Cocoa installers are available.
diff --git a/doc/INSTALL.html b/doc/INSTALL.html
index 1845c4f3e8c2..d1cdb4721928 100644
--- a/doc/INSTALL.html
+++ b/doc/INSTALL.html
@@ -77,13 +77,13 @@
-Last Updated: Thursday March 19, 2015
-Last Change : Thursday March 19, 2015
+Last Updated: Monday June 15, 2015
+Last Change : Monday June 15, 2015
@@ -219,7 +219,10 @@
2. Overview
-- for GRASS plugin - GRASS >= 6.0.0 (libraries compiled with exceptions support on Linux 32bit)
+
- for GRASS providers and plugin - GRASS >= 6.0.0. QGIS may be compiled with GRASS 6 or GRASS 7.
+ It can also be compiled with both GRASS versions in a single build but only if QGIS
+ is not installed with rpath. The desired GRASS version is choosen on runtime by setting
+ LD_LIBRARY_PATH or PATH.
- for georeferencer - GSL >= 1.8
- for postgis support and SPIT plugin - PostgreSQL >= 8.0.x
- for gps plugin - gpsbabel
@@ -853,7 +856,7 @@
4.2.2. Qt
C:\Qt\4.8.0\bin\qtvars.bat compile_debug
-Note: there is a problem when compiling debug version of Qt 4.8, the script ends with
+Note: there is a problem when compiling debug version of Qt 4.7, the script ends with
this message "mingw32-make: *** No rule to make target `debug'. Stop.". To
compile the debug version you have to go out of src directory and execute the
following command:
@@ -1443,7 +1446,7 @@
5.2. Install Qt4 from disk image
decide between 32-bit support in the older Qt Carbon branch, or 64-bit
support in the Qt Cocoa branch. Appropriate installers are available for both
as of Qt-4.5.2, though they stopped making Carbon packages at Qt 4.7.4.
-
+Qt 4.6+ is recommended for Cocoa.
Starting with Lion, Carbon may not work properly, if at all.
Starting with Qt 4.8, only 64bit Cocoa installers are available.
diff --git a/doc/msys.t2t b/doc/msys.t2t
index 1b991ea4e5fb..eb1bd12ba23a 100644
--- a/doc/msys.t2t
+++ b/doc/msys.t2t
@@ -39,18 +39,18 @@ it, just point the installer to c:\msys\mingw
When Qt installation is complete:
-Edit C:\Qt\4.7.0\bin\qtvars.bat and add the following lines:
+Edit C:\Qt\4.8.0\bin\qtvars.bat and add the following lines:
```
set PATH=%PATH%;C:\msys\local\bin;c:\msys\local\lib
set PATH=%PATH%;"C:\Program Files\Subversion\bin"
```
-I suggest you also add C:\Qt\4.7.0\bin\ to your Environment Variables Path in
+I suggest you also add C:\Qt\4.8.0\bin\ to your Environment Variables Path in
the windows system preferences.
If you plan to do some debugging, you'll need to compile debug version of Qt:
-C:\Qt\4.7.0\bin\qtvars.bat compile_debug
+C:\Qt\4.8.0\bin\qtvars.bat compile_debug
Note: there is a problem when compiling debug version of Qt 4.7, the script ends with
this message "mingw32-make: *** No rule to make target `debug'. Stop.". To
@@ -58,7 +58,7 @@ compile the debug version you have to go out of src directory and execute the
following command:
```
-c:\Qt\4.7.0 make
+c:\Qt\4.8.0 make
```
=== Flex and Bison ===
@@ -90,7 +90,7 @@ to get versions that match your current Qt installed version.
==== Compile SIP ====
```
-c:\Qt\4.7.0\bin\qtvars.bat
+c:\Qt\4.8.0\bin\qtvars.bat
python configure.py -p win32-g++
make
make install
@@ -99,7 +99,7 @@ make install
==== Compile PyQt ====
```
-c:\Qt\4.7.0\bin\qtvars.bat
+c:\Qt\4.8.0\bin\qtvars.bat
python configure.py
make
make install
@@ -148,10 +148,10 @@ Start a cmd.exe window ( Start -> Run -> cmd.exe ) if you don't have one
already. Add paths to compiler and our MSYS environment:
```
-c:\Qt\4.7.0\bin\qtvars.bat
+c:\Qt\4.8.0\bin\qtvars.bat
```
-For ease of use add c:\Qt\4.7.0\bin\ to your system path in system
+For ease of use add c:\Qt\4.8.0\bin\ to your system path in system
properties so you can just type qtvars.bat when you open the cmd console.
Create build directory and set it as current directory:
diff --git a/doc/overview.t2t b/doc/overview.t2t
index 07fde7a3405e..96d6eac36512 100644
--- a/doc/overview.t2t
+++ b/doc/overview.t2t
@@ -27,7 +27,10 @@ Required build dependencies:
Optional dependencies:
-- for GRASS plugin - GRASS >= 6.0.0 (libraries compiled with exceptions support on Linux 32bit)
+- for GRASS providers and plugin - GRASS >= 6.0.0. QGIS may be compiled with GRASS 6 or GRASS 7.
+ It can also be compiled with both GRASS versions in a single build but only if QGIS
+ is not installed with rpath. The desired GRASS version is choosen on runtime by setting
+ LD_LIBRARY_PATH or PATH.
- for georeferencer - GSL >= 1.8
- for postgis support and SPIT plugin - PostgreSQL >= 8.0.x
- for gps plugin - gpsbabel