Skip to content

Commit fa4eb9f

Browse files
author
kyngchaos
committed
update Mac build for Qt minimum and misc cleanup
git-svn-id: http://svn.osgeo.org/qgis/trunk@13163 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 9085d5e commit fa4eb9f

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

INSTALL

+5-5
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ Xcode (in particular if you are using Xcode 2.5 on Tiger):
493493
4.2. Install Qt4 from .dmg
494494
==========================
495495

496-
You need a minimum of Qt-4.3.0. I suggest getting the latest.
496+
You need a minimum of Qt-4.4.0. I suggest getting the latest.
497497

498498
Snow Leopard note: If you are building on Snow Leopard, you will need to
499499
decide between 32-bit support in the older, Qt Carbon branch, or 64-bit
@@ -510,7 +510,7 @@ addition to the non-debug frameworks.
510510
Once downloaded open the dmg and run the installer. Note you need admin
511511
privileges to install.
512512

513-
Qt 4.4+ note: Starting in Qt 4.4 (?) libQtCLucene was added, and in 4.5
513+
Qt note: Starting in Qt 4.4, libQtCLucene was added, and in 4.5
514514
libQtUiTools was added, both in /usr/lib. When using a system SDK (which will
515515
happen in the Xcode build), these libraries will not be found. To fix this problem,
516516
add symlinks to /usr/local:
@@ -676,7 +676,7 @@ and (this installs by default into the Python framework, and is appropriate only
676676
yes
677677

678678

679-
There is a problem with the configuration that needs to be fixed now (it affect PyQwt compilation later). Edit pyqtconfig.py and change the qt_dir line to:
679+
There is a problem with the configuration that needs to be fixed now (it affects PyQwt compilation later). Edit pyqtconfig.py and change the qt_dir line to:
680680

681681

682682
'qt_dir': '/usr',
@@ -732,10 +732,10 @@ You can take care of both with the PyQwt source from:
732732
http://pyqwt.sourceforge.net/
733733

734734

735-
Double-click the tarball to unpack it.
735+
Double-click the tarball to unpack it. The following assumes PyQwt v5.2.0 (comes with Qwt 5.2.1).
736736

737737
Now, first edit qwtconfig.pri in the qwt-5.2 subdir and change some settings so
738-
you don't get a bloated debug static library (too bad they are configurable from
738+
you don't get a bloated debug static library (too bad they are not configurable from
739739
qmake). Scroll down to the 'release/debug mode' block. Edit the last 'CONFIG +='
740740
line, within an 'else' block, and change 'debug' to 'release'. Also uncomment
741741
(remove # prefix) the line 'CONFIG += QwtDll'.

doc/INSTALL.t2t

+5-5
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ sudo ln -s /usr/local/ local
388388

389389
== Install Qt4 from .dmg ==
390390

391-
You need a minimum of Qt-4.3.0. I suggest getting the latest.
391+
You need a minimum of Qt-4.4.0. I suggest getting the latest.
392392

393393
__Snow Leopard note:__ If you are building on Snow Leopard, you will need to
394394
decide between 32-bit support in the older, Qt Carbon branch, or 64-bit
@@ -405,7 +405,7 @@ addition to the non-debug frameworks.
405405
Once downloaded open the dmg and run the installer. Note you need admin
406406
privileges to install.
407407

408-
__Qt 4.4+ note:__ Starting in Qt 4.4 (?) libQtCLucene was added, and in 4.5
408+
__Qt note:__ Starting in Qt 4.4, libQtCLucene was added, and in 4.5
409409
libQtUiTools was added, both in /usr/lib. When using a system SDK (which will
410410
happen in the Xcode build), these libraries will not be found. To fix this problem,
411411
add symlinks to /usr/local:
@@ -563,7 +563,7 @@ python configure.py
563563
yes
564564
```
565565

566-
There is a problem with the configuration that needs to be fixed now (it affect PyQwt compilation later). Edit pyqtconfig.py and change the qt_dir line to:
566+
There is a problem with the configuration that needs to be fixed now (it affects PyQwt compilation later). Edit pyqtconfig.py and change the qt_dir line to:
567567

568568
```
569569
'qt_dir': '/usr',
@@ -618,10 +618,10 @@ You can take care of both with the PyQwt source from:
618618
http://pyqwt.sourceforge.net/
619619
```
620620

621-
Double-click the tarball to unpack it.
621+
Double-click the tarball to unpack it. The following assumes PyQwt v5.2.0 (comes with Qwt 5.2.1).
622622

623623
Now, first edit qwtconfig.pri in the qwt-5.2 subdir and change some settings so
624-
you don't get a bloated debug static library (too bad they are configurable from
624+
you don't get a bloated debug static library (too bad they are not configurable from
625625
qmake). Scroll down to the 'release/debug mode' block. Edit the last 'CONFIG +='
626626
line, within an 'else' block, and change 'debug' to 'release'. Also uncomment
627627
(remove # prefix) the line 'CONFIG += QwtDll'.

0 commit comments

Comments
 (0)