Skip to content

Commit bbe2e2a

Browse files
jef-njef-n
committedJun 14, 2015
run t2t
·
ltr-3_40archive/master_2
1 parent ac8d4df commit bbe2e2a

File tree

5 files changed

+30
-24
lines changed

5 files changed

+30
-24
lines changed
 

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ notifications:
1616
urls:
1717
- https://webhooks.gitter.im/e/5d0244ab020a75bf7d17
1818
on_success: change # options: [always|never|change] default: always
19-
on_failure: always # options: [always|never|change] default: always
19+
on_failure: change # options: [always|never|change] default: always
2020
on_start: never # default: never
2121

2222
addons:

‎INSTALL

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
QGIS
22
Building QGIS from source - step by step
3-
Thursday March 19, 2015
3+
Monday June 15, 2015
44

55

6-
Last Updated: Thursday March 19, 2015
7-
Last Change : Thursday March 19, 2015
6+
Last Updated: Monday June 15, 2015
7+
Last Change : Monday June 15, 2015
88

99

1010
1. Introduction
@@ -109,9 +109,9 @@ Required build dependencies:
109109
Optional dependencies:
110110

111111
- for GRASS providers and plugin - GRASS >= 6.0.0. QGIS may be compiled with GRASS 6 or GRASS 7.
112-
It can also be compiled with both GRASS versions in a single build but only if QGIS
113-
is not installed with rpath. The desired GRASS version is choosen on runtime by setting
114-
LD_LIBRARY_PATH or PATH.
112+
It can also be compiled with both GRASS versions in a single build but only if QGIS
113+
is not installed with rpath. The desired GRASS version is choosen on runtime by setting
114+
LD_LIBRARY_PATH or PATH.
115115
- for georeferencer - GSL >= 1.8
116116
- for postgis support and SPIT plugin - PostgreSQL >= 8.0.x
117117
- for gps plugin - gpsbabel
@@ -566,7 +566,7 @@ the windows system preferences.
566566
If you plan to do some debugging, you'll need to compile debug version of Qt:
567567
C:\Qt\4.8.0\bin\qtvars.bat compile_debug
568568

569-
Note: there is a problem when compiling debug version of Qt 4.8, the script ends with
569+
Note: there is a problem when compiling debug version of Qt 4.7, the script ends with
570570
this message "mingw32-make: *** No rule to make target `debug'. Stop.". To
571571
compile the debug version you have to go out of src directory and execute the
572572
following command:
@@ -1036,7 +1036,7 @@ Snow Leopard+ note: If you are building on Snow Leopard+, you will need to
10361036
decide between 32-bit support in the older Qt Carbon branch, or 64-bit
10371037
support in the Qt Cocoa branch. Appropriate installers are available for both
10381038
as of Qt-4.5.2, though they stopped making Carbon packages at Qt 4.7.4.
1039-
1039+
Qt 4.6+ is recommended for Cocoa.
10401040
Starting with Lion, Carbon may not work properly, if at all.
10411041
Starting with Qt 4.8, only 64bit Cocoa installers are available.
10421042

‎doc/INSTALL.html

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@
7777
<DIV CLASS="header" ID="header">
7878
<H1>QGIS</H1>
7979
<H2>Building QGIS from source - step by step</H2>
80-
<H3>Thursday March 19, 2015</H3>
80+
<H3>Monday June 15, 2015</H3>
8181
</DIV>
8282

8383
<DIV CLASS="body" ID="body">
8484
<P>
85-
Last Updated: Thursday March 19, 2015
86-
Last Change : Thursday March 19, 2015
85+
Last Updated: Monday June 15, 2015
86+
Last Change : Monday June 15, 2015
8787
</P>
8888
<DIV CLASS="toc">
8989

@@ -219,7 +219,10 @@ <H1>2. Overview</H1>
219219
</P>
220220

221221
<UL>
222-
<LI>for GRASS plugin - GRASS &gt;= 6.0.0 (libraries compiled with exceptions support on Linux 32bit)
222+
<LI>for GRASS providers and plugin - GRASS &gt;= 6.0.0. QGIS may be compiled with GRASS 6 or GRASS 7.
223+
It can also be compiled with both GRASS versions in a single build but only if QGIS
224+
is not installed with rpath. The desired GRASS version is choosen on runtime by setting
225+
LD_LIBRARY_PATH or PATH.
223226
<LI>for georeferencer - GSL &gt;= 1.8
224227
<LI>for postgis support and SPIT plugin - PostgreSQL &gt;= 8.0.x
225228
<LI>for gps plugin - gpsbabel
@@ -853,7 +856,7 @@ <H3>4.2.2. Qt</H3>
853856
C:\Qt\4.8.0\bin\qtvars.bat compile_debug
854857
</P>
855858
<P>
856-
Note: there is a problem when compiling debug version of Qt 4.8, the script ends with
859+
Note: there is a problem when compiling debug version of Qt 4.7, the script ends with
857860
this message "mingw32-make: *** No rule to make target `debug'. Stop.". To
858861
compile the debug version you have to go out of src directory and execute the
859862
following command:
@@ -1443,7 +1446,7 @@ <H2>5.2. Install Qt4 from disk image</H2>
14431446
decide between 32-bit support in the older Qt Carbon branch, or 64-bit
14441447
support in the Qt Cocoa branch. Appropriate installers are available for both
14451448
as of Qt-4.5.2, though they stopped making Carbon packages at Qt 4.7.4.
1446-
1449+
Qt 4.6+ is recommended for Cocoa.
14471450
Starting with Lion, Carbon may not work properly, if at all.
14481451
Starting with Qt 4.8, only 64bit Cocoa installers are available.
14491452
</P>

‎doc/msys.t2t

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,26 +39,26 @@ it, just point the installer to c:\msys\mingw
3939

4040
When Qt installation is complete:
4141

42-
Edit C:\Qt\4.7.0\bin\qtvars.bat and add the following lines:
42+
Edit C:\Qt\4.8.0\bin\qtvars.bat and add the following lines:
4343

4444
```
4545
set PATH=%PATH%;C:\msys\local\bin;c:\msys\local\lib
4646
set PATH=%PATH%;"C:\Program Files\Subversion\bin"
4747
```
4848

49-
I suggest you also add C:\Qt\4.7.0\bin\ to your Environment Variables Path in
49+
I suggest you also add C:\Qt\4.8.0\bin\ to your Environment Variables Path in
5050
the windows system preferences.
5151

5252
If you plan to do some debugging, you'll need to compile debug version of Qt:
53-
C:\Qt\4.7.0\bin\qtvars.bat compile_debug
53+
C:\Qt\4.8.0\bin\qtvars.bat compile_debug
5454

5555
Note: there is a problem when compiling debug version of Qt 4.7, the script ends with
5656
this message "mingw32-make: *** No rule to make target `debug'. Stop.". To
5757
compile the debug version you have to go out of src directory and execute the
5858
following command:
5959

6060
```
61-
c:\Qt\4.7.0 make
61+
c:\Qt\4.8.0 make
6262
```
6363

6464
=== Flex and Bison ===
@@ -90,7 +90,7 @@ to get versions that match your current Qt installed version.
9090
==== Compile SIP ====
9191

9292
```
93-
c:\Qt\4.7.0\bin\qtvars.bat
93+
c:\Qt\4.8.0\bin\qtvars.bat
9494
python configure.py -p win32-g++
9595
make
9696
make install
@@ -99,7 +99,7 @@ make install
9999
==== Compile PyQt ====
100100

101101
```
102-
c:\Qt\4.7.0\bin\qtvars.bat
102+
c:\Qt\4.8.0\bin\qtvars.bat
103103
python configure.py
104104
make
105105
make install
@@ -148,10 +148,10 @@ Start a cmd.exe window ( Start -> Run -> cmd.exe ) if you don't have one
148148
already. Add paths to compiler and our MSYS environment:
149149

150150
```
151-
c:\Qt\4.7.0\bin\qtvars.bat
151+
c:\Qt\4.8.0\bin\qtvars.bat
152152
```
153153

154-
For ease of use add c:\Qt\4.7.0\bin\ to your system path in system
154+
For ease of use add c:\Qt\4.8.0\bin\ to your system path in system
155155
properties so you can just type qtvars.bat when you open the cmd console.
156156
Create build directory and set it as current directory:
157157

‎doc/overview.t2t

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@ Required build dependencies:
2727

2828
Optional dependencies:
2929

30-
- for GRASS plugin - GRASS >= 6.0.0 (libraries compiled with exceptions support on Linux 32bit)
30+
- for GRASS providers and plugin - GRASS >= 6.0.0. QGIS may be compiled with GRASS 6 or GRASS 7.
31+
It can also be compiled with both GRASS versions in a single build but only if QGIS
32+
is not installed with rpath. The desired GRASS version is choosen on runtime by setting
33+
LD_LIBRARY_PATH or PATH.
3134
- for georeferencer - GSL >= 1.8
3235
- for postgis support and SPIT plugin - PostgreSQL >= 8.0.x
3336
- for gps plugin - gpsbabel

0 commit comments

Comments
 (0)
Please sign in to comment.