Skip to content
Permalink
Browse files

Merge remote-tracking branch 'upstream/master'

  • Loading branch information
vmora committed Jul 9, 2013
2 parents 61062d7 + 7ccd3d0 commit b912256409bdb73aaf4668440e26180402e4a909
Showing with 5,622 additions and 2,540 deletions.
  1. +37 −19 INSTALL
  2. +47 −20 doc/INSTALL.html
  3. +54 −54 doc/TRANSLATORS
  4. +37 −16 doc/osx.t2t
  5. +1 −1 i18n/qgis_fr.ts
  6. +530 −513 i18n/qgis_ja.ts
  7. +4,607 −1,531 i18n/qgis_ko_KR.ts
  8. +2 −2 python/console/console_settings.py
  9. +3 −3 python/core/composer/qgscomposertable.sip
  10. +0 −83 python/core/qgsfeature.sip
  11. +1 −1 python/pyplugin_installer/installer_data.py
  12. +7 −1 src/app/composer/qgsattributeselectiondialog.cpp
  13. +23 −12 src/app/nodetool/qgsmaptoolnodetool.cpp
  14. +5 −2 src/app/qgsaddattrdialog.cpp
  15. +1 −1 src/app/qgsaddattrdialog.h
  16. +1 −1 src/app/qgsbrowserdockwidget.cpp
  17. +5 −0 src/app/qgsfieldcalculator.cpp
  18. +27 −21 src/core/composer/qgscomposerattributetable.cpp
  19. +3 −3 src/core/composer/qgscomposerattributetable.h
  20. +25 −29 src/core/composer/qgscomposertable.cpp
  21. +3 −3 src/core/composer/qgscomposertable.h
  22. +6 −3 src/core/qgsbrowsermodel.cpp
  23. +17 −1 src/core/qgscontexthelp.cpp
  24. +2 −10 src/core/qgscontexthelp.h
  25. +8 −1 src/core/qgsdataitem.cpp
  26. +5 −3 src/core/qgsvectorlayereditbuffer.cpp
  27. +113 −194 src/plugins/globe/globe_plugin.cpp
  28. BIN src/plugins/globe/images/gui/MoveWheel.png
  29. BIN src/plugins/globe/images/gui/YawPitchWheel.png
  30. BIN src/plugins/globe/images/gui/button-background.png
  31. BIN src/plugins/globe/images/gui/move-down.png
  32. BIN src/plugins/globe/images/gui/move-left.png
  33. BIN src/plugins/globe/images/gui/move-right.png
  34. BIN src/plugins/globe/images/gui/move-up.png
  35. BIN src/plugins/globe/images/gui/refresh-view.png
  36. BIN src/plugins/globe/images/gui/rotate-ccw.png
  37. BIN src/plugins/globe/images/gui/rotate-cw.png
  38. BIN src/plugins/globe/images/gui/rotate-reset.png
  39. BIN src/plugins/globe/images/gui/tilt-down.png
  40. BIN src/plugins/globe/images/gui/tilt-up.png
  41. BIN src/plugins/globe/images/gui/zoom-home.png
  42. BIN src/plugins/globe/images/gui/zoom-in.png
  43. BIN src/plugins/globe/images/gui/zoom-out.png
  44. +2 −2 src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
  45. +46 −6 src/providers/ogr/qgsogrprovider.cpp
  46. +2 −2 src/providers/postgres/qgspostgresconn.cpp
  47. +2 −2 src/providers/postgres/qgspostgresprovider.cpp
56 INSTALL
@@ -1,10 +1,10 @@
QGIS
Building QGIS from source - step by step
Tuesday May 21, 2013
Monday July 08, 2013


Last Updated: Tuesday May 21, 2013
Last Change : Tuesday May 21, 2013
Last Updated: Monday July 08, 2013
Last Change : Wednesday May 22, 2013


1. Introduction
@@ -1198,6 +1198,10 @@ which can be used in build shell scripts like:

make -j $(/usr/sbin/sysctl -n hw.ncpu)

Note: if you get an error in parallel compilation, try removing the -j # flag,
so it's just 'make', or using a smaller number. Sometimes make can hiccup on too
many threads.


5.1. Install Developer Tools
============================
@@ -1207,14 +1211,12 @@ Snow Leopard, the Developer Tools, later called Xcode, were included with the
system install disks, though it's best to download the latest version compatible
with your system to get important updates fixing various issues.
Starting with Lion, Xcode is available as a download and from the App Store.
BUT, there is really no need for the full Xcode on Lion, and in fact could be
tricky to use for compiling QGIS.

Downloading Xcode/Developer Tools requires a free developer account at
Downloading Xcode/Developer Tools for up through Snow Leopard requires a free developer account at
developer.apple.com. Up through Snow Leopard, get the latest Xcode that is
supported for your system. For Lion, all you need is the much smaller
Command Line Tools for Xcode (you don't get the IDE or system SDKs but they are not
necessary for QGIS). When installing Xcode up through Snow Leopard, make sure to
supported for your system. For Lion and above, you can get Xcode from either a
free developer account or for a minimal fee from the app store.
When installing Xcode up through Snow Leopard, make sure to
do a custom install and install the Unix Development or Command Line Tools option.

On Lion, if you have installed Xcode 4.0 - 4.2 and are upgrading to 4.3, it's
@@ -1223,8 +1225,7 @@ a good idea to uninstall the old version first with:
sudo /Developer/Library/uninstall-devtools

On Lion and Mt. Lion, using Xcode 4.4+, the developer command line tools can be
installed via the Xcode preferences. The tools now appear to require an install
of Xcode, regardless of using a separate DMG installer for just the tools.
installed via the Xcode preferences.

Xcode 4.3+ also introduces the clang frontend to the LLVM compiler as default.

@@ -1421,7 +1422,7 @@ http://download.osgeo.org/libspatialindex/
Double-click the source tarball to unpack, then, in Terminal.app, cd to the
source folder and:

./configure
./configure --disable-dependency-tracking CFLAGS=-Os
make
sudo make install

@@ -1446,6 +1447,9 @@ your own risk.
5.4.5. Additional dependencies: SIP
===================================

Mt Lion note: SIP 4.15.7 appears to not work on Mt Lion. Install 4.14.6.
(or a later working version when available)

Retrieve the python bindings toolkit SIP from

http://www.riverbankcomputing.com/software/sip/download
@@ -1488,10 +1492,17 @@ For 64-bit Qt (Qt Cocoa), use this configure line:
Lion+ system Python

Similar to Snow Leopard, you should install outside the system Python path.
There is no need for the SDK option or arch option:
The SDK option should match the system you are compiling on:

for Lion:

python2.7 configure.py -d /Library/Python/2.7/site-packages -b /usr/local/bin \
-e /usr/local/include -v /usr/local/share/sip
-e /usr/local/include -v /usr/local/share/sip --arch=x86_64 -s MacOSX10.7.sdk

for Mt. Lion:

python2.7 configure.py -d /Library/Python/2.7/site-packages -b /usr/local/bin \
-e /usr/local/include -v /usr/local/share/sip --arch=x86_64 -s MacOSX10.8.sdk

continue...

@@ -1596,7 +1607,7 @@ For 64-bit Qt (Qt Cocoa), use this configure line:
Lion and Mt. Lion system Python

Similar to Snow Leopard, you should install outside the system Python path.
But you don't need the arch option:
But you don't need the use-arch option:

python2.7 configure.py -d /Library/Python/2.7/site-packages -b /usr/local/bin -n /usr/local/Qt4.8/qsci -v /usr/local/share/sip/PyQt4

@@ -1622,7 +1633,11 @@ Snow Leopard: substitute '2.6' for Python version
cd Python
python2.7 configure.py -o /usr/local/lib -n /usr/local/include \
-d /Library/Python/2.7/site-packages/PyQt4 -v /usr/local/share/sip/PyQt4 \
--pyqt-sipdir=/usr/local/share/sip/PyQt4
--sip-incdir=/usr/local/include --pyqt-sipdir=/usr/local/share/sip/PyQt4
cat >>Qsci.pro <<EOF
QMAKE_LFLAGS_PLUGIN -= -dynamiclib
QMAKE_LFLAGS_PLUGIN += -bundle
EOF
qmake -spec macx-g++ Qsci.pro
make -j [#cpus]
sudo make install
@@ -1764,7 +1779,7 @@ In a new Terminal cd to the source folder and:
make install
sudo mkdir -p "/Library/Application Support/OpenSceneGraph/PlugIns"

Enter the staging path you chose for the CMAKE_INSTALL_PREFIX option above.
Open the staging folder you chose for the CMAKE_INSTALL_PREFIX option above.

Now move all .frameworks from the lib/ folder in the staging area to /Library/Frameworks. Move the files in the osgPlugins folder in the lib/ folder
to /Library/Application Support/OpenSceneGraph/PlugIns. The bin/ executables
@@ -1788,6 +1803,8 @@ http://github.com/gwaldron/osgearth/tags
Download a tarball for the latest stable release (sorting can be confusing here).
Double-click the source tarball to unpack it.

Note: for now stick with version 2.3. There are compile errors in 2.4 that need attention.

This one also needs an intermediate staging area. Choose a folder similar to OSG.

In a new Terminal cd to the source folder and:
@@ -1803,13 +1820,14 @@ In a new Terminal cd to the source folder and:
make install
sudo mkdir -p "/Library/Application Support/OpenSceneGraph/Headers"

Enter the staging path you chose for the CMAKE_INSTALL_PREFIX option above.
Also enter the OSG staging path /bin folder in the export above.
Open the staging folder you chose for the CMAKE_INSTALL_PREFIX option above.
Also open the OSG staging path /bin folder from the OSG build.

Move all the .frameworks from the lib/ folder to /Library/Frameworks.
Move the files in the osgPlugins folder in the lib/ folder to
/Library/Application Support/OpenSceneGraph/PlugIns. Move the osgEarthDrivers
folder in the include/ folder to /Library/Application Support/OpenSceneGraph/Headers.
(you may need to create this folder)
And as for OSG, you can leave the bin/ executables where they are.


@@ -77,13 +77,13 @@
<DIV CLASS="header" ID="header">
<H1>QGIS</H1>
<H2>Building QGIS from source - step by step</H2>
<H3>Tuesday May 21, 2013</H3>
<H3>Monday July 08, 2013</H3>
</DIV>

<DIV CLASS="body" ID="body">
<P>
Last Updated: Tuesday May 21, 2013
Last Change : Tuesday May 21, 2013
Last Updated: Monday July 08, 2013
Last Change : Wednesday May 22, 2013
</P>
<DIV CLASS="toc">

@@ -1712,6 +1712,12 @@ <H1>5. Building on MacOS X</H1>
make -j $(/usr/sbin/sysctl -n hw.ncpu)
</PRE></div>

<P>
<U>Note:</U> if you get an error in parallel compilation, try removing the -j # flag,
so it's just 'make', or using a smaller number. Sometimes make can hiccup on too
many threads.
</P>

<A NAME="toc18"></A>
<H2>5.1. Install Developer Tools</H2>

@@ -1721,15 +1727,13 @@ <H2>5.1. Install Developer Tools</H2>
system install disks, though it's best to download the latest version compatible
with your system to get important updates fixing various issues.
Starting with Lion, Xcode is available as a download and from the App Store.
BUT, there is really no need for the full Xcode on Lion, and in fact could be
tricky to use for compiling QGIS.
</P>
<P>
Downloading Xcode/Developer Tools requires a free developer account at
Downloading Xcode/Developer Tools for up through Snow Leopard requires a free developer account at
developer.apple.com. Up through Snow Leopard, get the latest <U>Xcode</U> that is
supported for your system. For Lion, all you need is the much smaller
<U>Command Line Tools for Xcode</U> (you don't get the IDE or system SDKs but they are not
necessary for QGIS). When installing Xcode up through Snow Leopard, make sure to
supported for your system. For Lion and above, you can get Xcode from either a
free developer account or for a minimal fee from the app store.
When installing Xcode up through Snow Leopard, make sure to
do a custom install and install the Unix Development or Command Line Tools option.
</P>
<P>
@@ -1743,8 +1747,7 @@ <H2>5.1. Install Developer Tools</H2>

<P>
On Lion and Mt. Lion, using Xcode 4.4+, the developer command line tools can be
installed via the Xcode preferences. The tools now appear to require an install
of Xcode, regardless of using a separate DMG installer for just the tools.
installed via the Xcode preferences.
</P>
<P>
Xcode 4.3+ also introduces the clang frontend to the LLVM compiler as default.
@@ -2001,7 +2004,7 @@ <H3>5.4.3. Additional dependencies: Spatialindex</H3>
</P>

<div class="code"><PRE>
./configure
./configure --disable-dependency-tracking CFLAGS=-Os
make
sudo make install
</PRE></div>
@@ -2028,6 +2031,10 @@ <H3>5.4.4. Additional dependencies: Python</H3>

<H3>5.4.5. Additional dependencies: SIP</H3>

<P>
<U>Mt Lion note:</U> SIP 4.15.7 appears to not work on Mt Lion. Install 4.14.6.
(or a later working version when available)
</P>
<P>
Retrieve the python bindings toolkit SIP from
</P>
@@ -2094,12 +2101,24 @@ <H3>5.4.5. Additional dependencies: SIP</H3>
</P>
<P>
Similar to Snow Leopard, you should install outside the system Python path.
There is no need for the SDK option or arch option:
The SDK option should match the system you are compiling on:
</P>
<P>
for Lion:
</P>

<div class="code"><PRE>
python2.7 configure.py -d /Library/Python/2.7/site-packages -b /usr/local/bin \
-e /usr/local/include -v /usr/local/share/sip
-e /usr/local/include -v /usr/local/share/sip --arch=x86_64 -s MacOSX10.7.sdk
</PRE></div>

<P>
for Mt. Lion:
</P>

<div class="code"><PRE>
python2.7 configure.py -d /Library/Python/2.7/site-packages -b /usr/local/bin \
-e /usr/local/include -v /usr/local/share/sip --arch=x86_64 -s MacOSX10.8.sdk
</PRE></div>

<P>
@@ -2251,7 +2270,7 @@ <H3>5.4.7. Additional dependencies: PyQt</H3>
</P>
<P>
Similar to Snow Leopard, you should install outside the system Python path.
But you don't need the arch option:
But you don't need the use-arch option:
</P>

<div class="code"><PRE>
@@ -2288,7 +2307,11 @@ <H3>5.4.8. Additional dependencies: QScintilla2 Python Module</H3>
cd Python
python2.7 configure.py -o /usr/local/lib -n /usr/local/include \
-d /Library/Python/2.7/site-packages/PyQt4 -v /usr/local/share/sip/PyQt4 \
--pyqt-sipdir=/usr/local/share/sip/PyQt4
--sip-incdir=/usr/local/include --pyqt-sipdir=/usr/local/share/sip/PyQt4
cat &gt;&gt;Qsci.pro &lt;&lt;EOF
QMAKE_LFLAGS_PLUGIN -= -dynamiclib
QMAKE_LFLAGS_PLUGIN += -bundle
EOF
qmake -spec macx-g++ Qsci.pro
make -j [#cpus]
sudo make install
@@ -2482,7 +2505,7 @@ <H3>5.4.13. Optional dependencies: OSG &amp; osgEarth</H3>
</PRE></div>

<P>
Enter the staging path you chose for the CMAKE_INSTALL_PREFIX option above.
Open the staging folder you chose for the CMAKE_INSTALL_PREFIX option above.
</P>
<P>
Now move all .frameworks from the lib/ folder in the staging area to /Library/Frameworks. Move the files in the osgPlugins folder in the lib/ folder
@@ -2517,6 +2540,9 @@ <H3>5.4.13. Optional dependencies: OSG &amp; osgEarth</H3>
Double-click the source tarball to unpack it.
</P>
<P>
<U>Note:</U> for now stick with version 2.3. There are compile errors in 2.4 that need attention.
</P>
<P>
This one also needs an intermediate staging area. Choose a folder similar to OSG.
</P>
<P>
@@ -2537,14 +2563,15 @@ <H3>5.4.13. Optional dependencies: OSG &amp; osgEarth</H3>
</PRE></div>

<P>
Enter the staging path you chose for the CMAKE_INSTALL_PREFIX option above.
Also enter the OSG staging path /bin folder in the export above.
Open the staging folder you chose for the CMAKE_INSTALL_PREFIX option above.
Also open the OSG staging path /bin folder from the OSG build.
</P>
<P>
Move all the .frameworks from the lib/ folder to /Library/Frameworks.
Move the files in the osgPlugins folder in the lib/ folder to
/Library/Application Support/OpenSceneGraph/PlugIns. Move the osgEarthDrivers
folder in the include/ folder to /Library/Application Support/OpenSceneGraph/Headers.
(you may need to create this folder)
And as for OSG, you can leave the bin/ executables where they are.
</P>

@@ -3193,5 +3220,5 @@ <H1>9. Authors and Acknowledgments</H1>

</DIV>
<!-- html code generated by txt2tags 2.6 (http://txt2tags.org) -->
<!-- cmdline: txt2tags -t html -o INSTALL.html INSTALL.t2t -->
<!-- cmdline: txt2tags -t html -o ../INSTALL.html INSTALL.t2t -->
</BODY></HTML>

0 comments on commit b912256

Please sign in to comment.
You can’t perform that action at this time.