Skip to content

Commit c947688

Browse files
committed
Use proper QGIS acronym (instead of Qgis) for OSX install notes
1 parent c70d216 commit c947688

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

INSTALL

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
Quantum GIS (QGIS)
22
Building QGIS from source - step by step
3-
Sunday November 06, 2011
3+
Tuesday December 27, 2011
44

55

6-
Last Updated: Sunday November 06, 2011
7-
Last Change : Sunday November 06, 2011
6+
Last Updated: Tuesday December 27, 2011
7+
Last Change : Tuesday December 27, 2011
88

99

1010
1. Introduction
@@ -1226,7 +1226,7 @@ http://www.kyngchaos.com/wiki/software/frameworks
12261226
Once downloaded, open and install the frameworks.
12271227

12281228
William provides an additional installer package for Postgresql (for PostGIS
1229-
support). Qgis just needs the libpq client library, so unless you want to
1229+
support). QGIS just needs the libpq client library, so unless you want to
12301230
setup the full Postgres + PostGIS server, all you need is the client-only
12311231
package. It's available here:
12321232

@@ -1242,7 +1242,7 @@ http://www.kyngchaos.com/wiki/software/grass
12421242

12431243
There are some additional dependencies that, at the time of writing, are not
12441244
provided as frameworks or installers so we will need to build these from source.
1245-
If you are wanting to build Qgis as a 64-bit application, you will need to
1245+
If you are wanting to build QGIS as a 64-bit application, you will need to
12461246
provide the appropriate build commands to produce 64-bit support in dependencies.
12471247
Likewise, for 32-bit support on Snow Leopard, you will need to override the
12481248
default system architecture, which is 64-bit, according to instructions for
@@ -1404,7 +1404,7 @@ http://pyqwt.sourceforge.net/
14041404

14051405
Double-click the tarball to unpack it. The following assumes PyQwt v5.2.0
14061406
(comes with Qwt 5.2.1). Normal compilation does both Qwt and PyQwt at the same
1407-
time, but Qwt is statically linked into PyQwt, and Qgis can't use it. So, we
1407+
time, but Qwt is statically linked into PyQwt, and QGIS can't use it. So, we
14081408
need to split the build.
14091409

14101410
Now, cd into the qwt-5.2 subdir in a Terminal. Type these commands to build
@@ -1522,7 +1522,7 @@ This will automatically find and use the previously installed frameworks, and
15221522
the GRASS application if installed.
15231523

15241524
Or, to use a Unix-style build of GRASS, use the following cmake invocation
1525-
(minimum GRASS version as stated in the Qgis requirements, substitute the GRASS
1525+
(minimum GRASS version as stated in the QGIS requirements, substitute the GRASS
15261526
path and version as required):
15271527

15281528
cmake -D CMAKE_INSTALL_PREFIX=~/Applications -D CMAKE_BUILD_TYPE=Release \
@@ -1553,7 +1553,7 @@ script and add arch flags to the configuration:
15531553
-D CMAKE_OSX_ARCHITECTURES=i386 -D PYTHON_EXECUTABLE=/usr/local/bin/python32 \
15541554
..
15551555

1556-
The Qgis Mapserver feature requires fastcgi support. This is included in
1556+
The QGIS Mapserver feature requires fastcgi support. This is included in
15571557
Leopard and Snow Leopard, but was dropped at Lion. To build the Mapserver
15581558
component on Leopard and Snow, add the followling line before the last line in
15591559
the above configuration:
@@ -1564,9 +1564,9 @@ On Lion you are on your own to figure out how to install libfcgi and add fcgi
15641564
support to the system Apache. Not recommended for the average user.
15651565

15661566
Bundling note: Older Qt versions may have problems with some Qt plugins and
1567-
Qgis. The way to handle this is to bundle Qt inside the Qgis application. You
1568-
can do this now or wait to see if there are immediate crashes when running Qgis.
1569-
It's also a good idea to bundle Qt if you need to copy Qgis to other Macs (where
1567+
QGIS. The way to handle this is to bundle Qt inside the QGIS application. You
1568+
can do this now or wait to see if there are immediate crashes when running QGIS.
1569+
It's also a good idea to bundle Qt if you need to copy QGIS to other Macs (where
15701570
you would have to install Xcode just so Qt would install!).
15711571

15721572
To bundle Qt, add the following line before the last line (the ".." line) in

doc/osx.t2t

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ http://www.kyngchaos.com/wiki/software/frameworks
8383
Once downloaded, open and install the frameworks.
8484

8585
William provides an additional installer package for Postgresql (for PostGIS
86-
support). Qgis just needs the libpq client library, so unless you want to
86+
support). QGIS just needs the libpq client library, so unless you want to
8787
setup the full Postgres + PostGIS server, all you need is the client-only
8888
package. It's available here:
8989

@@ -97,7 +97,7 @@ http://www.kyngchaos.com/wiki/software/grass
9797

9898
There are some additional dependencies that, at the time of writing, are not
9999
provided as frameworks or installers so we will need to build these from source.
100-
If you are wanting to build Qgis as a 64-bit application, you will need to
100+
If you are wanting to build QGIS as a 64-bit application, you will need to
101101
provide the appropriate build commands to produce 64-bit support in dependencies.
102102
Likewise, for 32-bit support on Snow Leopard, you will need to override the
103103
default system architecture, which is 64-bit, according to instructions for
@@ -274,7 +274,7 @@ http://pyqwt.sourceforge.net/
274274

275275
Double-click the tarball to unpack it. The following assumes PyQwt v5.2.0
276276
(comes with Qwt 5.2.1). Normal compilation does both Qwt and PyQwt at the same
277-
time, but Qwt is statically linked into PyQwt, and Qgis can't use it. So, we
277+
time, but Qwt is statically linked into PyQwt, and QGIS can't use it. So, we
278278
need to split the build.
279279

280280
Now, cd into the qwt-5.2 subdir in a Terminal. Type these commands to build
@@ -399,7 +399,7 @@ This will automatically find and use the previously installed frameworks, and
399399
the GRASS application if installed.
400400

401401
Or, to use a Unix-style build of GRASS, use the following cmake invocation
402-
(minimum GRASS version as stated in the Qgis requirements, substitute the GRASS
402+
(minimum GRASS version as stated in the QGIS requirements, substitute the GRASS
403403
path and version as required):
404404

405405
```
@@ -434,7 +434,7 @@ cmake -D CMAKE_INSTALL_PREFIX=~/Applications -D \
434434
..
435435
```
436436

437-
The Qgis Mapserver feature requires fastcgi support. This is included in
437+
The QGIS Mapserver feature requires fastcgi support. This is included in
438438
Leopard and Snow Leopard, but was dropped at Lion. To build the Mapserver
439439
component on Leopard and Snow, add the followling line before the last line in
440440
the above configuration:
@@ -447,9 +447,9 @@ On Lion you are on your own to figure out how to install libfcgi and add fcgi
447447
support to the system Apache. Not recommended for the average user.
448448

449449
__Bundling note:__ Older Qt versions may have problems with some Qt plugins and
450-
Qgis. The way to handle this is to bundle Qt inside the Qgis application. You
451-
can do this now or wait to see if there are immediate crashes when running Qgis.
452-
It's also a good idea to bundle Qt if you need to copy Qgis to other Macs (where
450+
QGIS. The way to handle this is to bundle Qt inside the QGIS application. You
451+
can do this now or wait to see if there are immediate crashes when running QGIS.
452+
It's also a good idea to bundle Qt if you need to copy QGIS to other Macs (where
453453
you would have to install Xcode just so Qt would install!).
454454

455455
To bundle Qt, add the following line before the last line (the ".." line) in

0 commit comments

Comments
 (0)