Skip to content

Commit 0fa4ce3

Browse files
committedOct 27, 2014
Merge remote-tracking branch 'origin/master'
2 parents 1932390 + 362d69c commit 0fa4ce3

File tree

610 files changed

+169904
-149365
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

610 files changed

+169904
-149365
lines changed
 

‎INSTALL

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
QGIS
22
Building QGIS from source - step by step
3-
Friday July 25, 2014
3+
Thursday October 23, 2014
44

55

6-
Last Updated: Friday July 25, 2014
7-
Last Change : Friday July 25, 2014
6+
Last Updated: Thursday October 23, 2014
7+
Last Change : Sunday September 28, 2014
88

99

1010
1. Introduction
@@ -1457,9 +1457,8 @@ your own risk.
14571457
5.4.5. Additional dependencies: SIP
14581458
===================================
14591459

1460-
Mt Lion note: SIP 4.15.7 appears to not work on Mt Lion. Install either
1461-
prior version: 4.14.6.
1462-
later version: 4.16.3+
1460+
Mt Lion note: SIP 4.15.7 appears to not work on Mt Lion. Install either
1461+
a prior version to 4.14.6 or a later version 4.16.3+
14631462

14641463
Retrieve the python bindings toolkit SIP from
14651464

@@ -1520,7 +1519,6 @@ for Mavericks:
15201519
python2.7 configure.py -d /Library/Python/2.7/site-packages -b /usr/local/bin \
15211520
-e /usr/local/include -v /usr/local/share/sip --arch=x86_64 -s MacOSX10.9.sdk
15221521

1523-
15241522
continue...
15251523

15261524
Then continue with compilation and installation:
@@ -1560,7 +1558,7 @@ Save the qscintilla.pro file and build the QScintilla2 C++ library:
15601558
sudo make install
15611559

15621560
adjust the install_name_tool command for the version installed of QScintilla installed:
1563-
1561+
15641562
sudo install_name_tool -id /usr/local/lib/libqscintilla2.11.dylib \
15651563
/usr/local/lib/libqscintilla2.11.dylib
15661564

@@ -1646,7 +1644,7 @@ Then make again.
16461644
This will create the Qsci.so module in /Library/Python/2.x/site-packages/PyQt4.
16471645
Like PyQt, it needs help to not install in system locations.
16481646

1649-
Snow Leopard: substitute 2.6 for Python version
1647+
Snow Leopard: substitute '2.6' for Python version
16501648

16511649
cd <QScintilla2 source dir>
16521650
cd Python

0 commit comments

Comments
 (0)