Skip to content
Permalink
Browse files

Merge branch 'master' of https://github.com/qgis/Quantum-GIS into atlas

Conflicts:
	src/core/composer/qgscomposition.cpp
  • Loading branch information
Hugo Mercier
Hugo Mercier committed Sep 28, 2012
2 parents c85ad5a + 500a953 commit 6e2320f26a32d08b36e3878fdf1d8972555cab62
Showing with 4,874 additions and 4,882 deletions.
  1. +10 −10 INSTALL
  2. +19 −24 doc/INSTALL.html
  3. +2 −0 doc/INSTALL.t2t
  4. +33 −33 doc/TRANSLATORS
  5. +1 −1 doc/msvc.t2t
  6. +1 −1 doc/overview.t2t
  7. +602 −454 i18n/qgis_de.ts
  8. +14 −0 i18n/qgis_it.ts
  9. +3,308 −3,774 i18n/qgis_sv.ts
  10. +4 −3 python/CMakeLists.txt
  11. +17 −27 python/analysis/analysis.sip
  12. +1 −1 python/analysis/interpolation/Triangulation.sip
  13. +0 −93 python/analysis/qgsgeometryanalyzer.sip
  14. +103 −0 python/analysis/vector/qgsgeometryanalyzer.sip
  15. +7 −2 python/analysis/{ → vector}/qgsoverlayanalyzer.sip
  16. 0 python/analysis/{ → vector}/qgszonalstatistics.sip
  17. +38 −7 python/console.py
  18. +72 −72 python/console_sci.py
  19. +2 −2 python/core/composer/qgscomposerlegenditem.sip
  20. +2 −2 python/core/gps/qgsgpsconnection.sip
  21. +1 −1 python/core/qgsoverlayobject.sip
  22. +1 −1 python/core/qgsproject.sip
  23. +1 −1 python/core/qgspythonrunner.sip
  24. +1 −1 python/core/qgsrasterdataprovider.sip
  25. +18 −18 python/core/qgsrasterrenderer.sip
  26. +1 −1 python/core/qgsrendercontext.sip
  27. +2 −2 python/core/qgssnapper.sip
  28. +1 −1 python/core/qgsvectorlayer.sip
  29. +5 −5 python/core/raster/qgsmultibandcolorrenderer.sip
  30. +4 −4 python/core/raster/qgspaletterasterrenderer.sip
  31. +1 −1 python/core/raster/qgsrasterlayer.sip
  32. +1 −1 python/core/raster/qgsrasterrenderer.sip
  33. +2 −2 python/core/raster/qgsrasterresamplefilter.sip
  34. +3 −3 python/core/raster/qgssinglebandgrayrenderer.sip
  35. +3 −3 python/core/raster/qgssinglebandpseudocolorrenderer.sip
  36. +3 −3 python/core/symbology-ng/qgspointdisplacementrenderer.sip
  37. +2 −2 python/core/symbology-ng/qgsrendererv2.sip
  38. +1 −1 python/core/symbology-ng/qgsrendererv2registry.sip
  39. +2 −2 python/core/symbology-ng/qgsrulebasedrendererv2.sip
  40. +1 −1 python/core/symbology-ng/qgssymbollayerv2registry.sip
  41. +1 −1 python/gui/qgsannotationitem.sip
  42. +1 −1 python/gui/qgstextannotationitem.sip
  43. +2 −2 python/help.py
  44. +85 −26 python/helpConsole/help.htm
  45. +3 −0 python/iconConsole/CMakeLists.txt
  46. BIN python/iconConsole/iconClassConsole.png
  47. BIN python/iconConsole/iconClearConsole.png
  48. BIN python/iconConsole/iconHelpConsole.png
  49. BIN python/iconConsole/iconIfaceConsole.png
  50. BIN python/iconConsole/iconOpenConsole.png
  51. BIN python/iconConsole/iconRunConsole.png
  52. BIN python/iconConsole/iconSaveConsole.png
  53. BIN python/iconConsole/iconScriptConsole.png
  54. BIN python/iconConsole/iconSextanteConsole.png
  55. BIN python/iconConsole/iconTempConsole.png
  56. BIN python/iconConsole/imgHelpDialog.png
  57. +22 −5 src/core/composer/qgscomposition.cpp
  58. +2 −0 src/core/composer/qgscomposition.h
  59. +18 −0 src/core/qgis.h
  60. +7 −7 src/core/qgsapplication.cpp
  61. +1 −1 src/core/qgsrasterprojector.cpp
  62. +3 −3 src/core/raster/qgsrasterrenderer.cpp
  63. +17 −17 src/core/symbology-ng/qgssinglesymbolrendererv2.cpp
  64. +11 −0 src/gui/qgsowssourceselect.cpp
  65. +4 −0 src/gui/qgsowssourceselect.h
  66. +84 −77 src/providers/gdal/qgsgdalprovider.cpp
  67. +3 −3 src/providers/ogr/qgsogrprovider.cpp
  68. +2 −0 src/providers/wcs/URI
  69. +51 −11 src/providers/wcs/qgswcsprovider.cpp
  70. +1 −1 src/providers/wcs/qgswcsprovider.h
  71. +22 −0 src/providers/wcs/qgswcssourceselect.cpp
  72. +176 −158 src/ui/qgsowssourceselectbase.ui
  73. +1 −0 tests/src/providers/testqgswcsprovider.cpp
  74. +1 −1 tests/src/providers/testqgswcspublicservers.cpp
  75. +1 −0 tests/src/python/CMakeLists.txt
  76. +60 −0 tests/src/python/test_qgsanalysis.py
  77. +5 −8 tests/src/python/test_qgscomposition.py
20 INSTALL
@@ -1,10 +1,10 @@
Quantum GIS (QGIS)
Building QGIS from source - step by step
Saturday August 04, 2012
Friday September 28, 2012


Last Updated: Saturday August 04, 2012
Last Change : Saturday July 21, 2012
Last Updated: Friday September 28, 2012
Last Change : Friday September 28, 2012


1. Introduction
@@ -110,7 +110,7 @@ Optional dependencies:
- for postgis support and SPIT plugin - PostgreSQL >= 8.0.x
- for gps plugin - expat >= 1.95 and gpsbabel
- for mapserver export and PyQGIS - Python >= 2.3 (2.5+ preferred)
- for python support - SIP >= 4.8, PyQt >= must match Qt version
- for python support - SIP >= 4.8, PyQt >= must match Qt version, Qscintilla2
- for qgis mapserver - FastCGI


@@ -593,6 +593,7 @@ Advanced Installation):
- sip
- spatialite
- libspatialindex-devel
- python-qscintilla

This will also select packages the above packages depend on.

@@ -605,9 +606,7 @@ Earlier versions of this document also covered how to build all above
dependencies. If you're interested in that, check the history of this page in the Wiki
or the SVN repository.


4.1.3. Setting up the Visual Studio project with CMake
======================================================
=== Setting up the Visual Studio project with CMake ===

To start a command prompt with an environment that both has the VC++ and the OSGeo4W
variables create the following batch file (assuming the above packages were
@@ -632,6 +631,7 @@ installed in the default locations):

@cmd


Start the batch file and on the command prompt checkout the QGIS source from
git to the source directory Quantum-GIS:

@@ -676,7 +676,7 @@ You will also either need to add all the dependency DLLs to the QGIS install
directory or add their respective directories to your PATH.


4.1.4. Packaging
4.1.3. Packaging
================

To create a standalone installer there is a perl script named 'creatensis.pl'
@@ -697,7 +697,7 @@ and 'bzip2') is available at:
http://cygwin.com


4.1.5. Packaging your own build of QGIS
4.1.4. Packaging your own build of QGIS
=======================================

Assuming you have completed the above packaging step, if you want to include
@@ -717,7 +717,7 @@ After this you should now have a nsis installer containing your own build
of QGIS and all dependencies needed to run it on a windows machine.


4.1.6. Osgeo4w packaging
4.1.5. Osgeo4w packaging
========================

The actual packaging process is currently not documented, for now please take a
@@ -5,7 +5,7 @@
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
<TITLE>Quantum GIS (QGIS)</TITLE>

<!-- Included style.css -->
<!-- Included /home/fischer/src/qgis/doc/style.css -->
<STYLE TYPE="text/css">
body{ background: white;
color: black;
@@ -77,13 +77,13 @@
<DIV CLASS="header" ID="header">
<H1>Quantum GIS (QGIS)</H1>
<H2>Building QGIS from source - step by step</H2>
<H3>Saturday August 04, 2012</H3>
<H3>Friday September 28, 2012</H3>
</DIV>

<DIV CLASS="body" ID="body">
<P>
Last Updated: Saturday August 04, 2012
Last Change : Saturday July 21, 2012
Last Updated: Friday September 28, 2012
Last Change : Friday September 28, 2012
</P>
<DIV CLASS="toc">

@@ -221,7 +221,7 @@ <H1>2. Overview</H1>
<LI>for postgis support and SPIT plugin - PostgreSQL &gt;= 8.0.x
<LI>for gps plugin - expat &gt;= 1.95 and gpsbabel
<LI>for mapserver export and PyQGIS - Python &gt;= 2.3 (2.5+ preferred)
<LI>for python support - SIP &gt;= 4.8, PyQt &gt;= must match Qt version
<LI>for python support - SIP &gt;= 4.8, PyQt &gt;= must match Qt version, Qscintilla2
<LI>for qgis mapserver - FastCGI
</UL>

@@ -949,30 +949,25 @@ <H3>4.1.2. Other tools and dependencies</H3>
<LI>sip
<LI>spatialite
<LI>libspatialindex-devel
</UL>

<P>
<LI>python-qscintilla
<P></P>
This will also select packages the above packages depend on.
</P>
<P>
<P></P>
Additionally QGIS also needs the include file <CODE>unistd.h</CODE>, which normally
doesn't exist on Windows. It's shipped with Flex/Bison in <CODE>GnuWin32\include</CODE>
and needs to be copied into the <CODE>VC\include</CODE> directory of your Visual C++
installation.
</P>
<P>
<P></P>
Earlier versions of this document also covered how to build all above
dependencies. If you're interested in that, check the history of this page in the Wiki
or the SVN repository.
</P>

<H3>4.1.3. Setting up the Visual Studio project with CMake</H3>

<P>
<P></P>
=== Setting up the Visual Studio project with CMake ===
<P></P>
To start a command prompt with an environment that both has the VC++ and the OSGeo4W
variables create the following batch file (assuming the above packages were
installed in the default locations):
</P>
<P></P>

<div class="code"><PRE>
@echo off
@@ -995,10 +990,10 @@ <H3>4.1.3. Setting up the Visual Studio project with CMake</H3>
@cmd
</PRE></div>

<P>
<P></P>
Start the batch file and on the command prompt checkout the QGIS source from
git to the source directory <CODE>Quantum-GIS</CODE>:
</P>
</UL>

<div class="code"><PRE>
git clone git://github.com/qgis/Quantum-GIS.git
@@ -1055,7 +1050,7 @@ <H3>4.1.3. Setting up the Visual Studio project with CMake</H3>
directory or add their respective directories to your PATH.
</P>

<H3>4.1.4. Packaging</H3>
<H3>4.1.3. Packaging</H3>

<P>
To create a standalone installer there is a perl script named 'creatensis.pl'
@@ -1082,7 +1077,7 @@ <H3>4.1.4. Packaging</H3>
<A HREF="http://cygwin.com">http://cygwin.com</A>
</BLOCKQUOTE>

<H3>4.1.5. Packaging your own build of QGIS</H3>
<H3>4.1.4. Packaging your own build of QGIS</H3>

<P>
Assuming you have completed the above packaging step, if you want to include
@@ -1110,7 +1105,7 @@ <H3>4.1.5. Packaging your own build of QGIS</H3>
of QGIS and all dependencies needed to run it on a windows machine.
</P>

<H3>4.1.6. Osgeo4w packaging</H3>
<H3>4.1.5. Osgeo4w packaging</H3>

<P>
The actual packaging process is currently not documented, for now please take a
@@ -2823,5 +2818,5 @@ <H1>8. Authors and Acknowledgments</H1>

</DIV>
<!-- html code generated by txt2tags 2.6 (http://txt2tags.org) -->
<!-- cmdline: txt2tags -o INSTALL.html -t html INSTALL.t2t -->
<!-- cmdline: txt2tags -o/home/fischer/src/qgis/debian/build/doc/INSTALL.html -t html /home/fischer/src/qgis/doc/INSTALL.t2t -->
</BODY></HTML>
@@ -61,6 +61,8 @@ Building QGIS from source - step by step
% End of comments
% -------------------

% change to force build: Fri, 28 Sep 2012 11:08:01 +0200

Last Updated: %%date(%A %B %d, %Y)
Last Change : %%mtime(%A %B %d, %Y)

0 comments on commit 6e2320f

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