Skip to content
Permalink
Browse files

Merge remote-tracking branch 'origin/master'

  • Loading branch information
ddehaan
ddehaan committed Oct 28, 2012
2 parents e0f9d53 + a9ff3cf commit 45fab4ba55a6e4ea3aeefe73342e029812842883
Showing with 9,290 additions and 7,378 deletions.
  1. +1 −1 CMakeLists.txt
  2. +14 −12 INSTALL
  3. +28 −21 doc/INSTALL.html
  4. +39 −39 doc/TRANSLATORS
  5. +2 −1 doc/overview.t2t
  6. +1,172 −1,634 i18n/qgis_de.ts
  7. +3,818 −2,523 i18n/qgis_gl_ES.ts
  8. +3 −1 python/console/console_output.py
  9. +4 −0 python/core/qgsapplication.sip
  10. +3 −0 python/core/qgsmaplayerregistry.sip
  11. +5 −2 python/core/qgsvectorlayerimport.sip
  12. +4 −5 python/plugins/GdalTools/tools/dialogSRS.py
  13. +11 −11 python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/__init__.py
  14. +2 −2 python/plugins/db_manager/layer_preview.py
  15. +2 −1 python/plugins/fTools/tools/doGeometry.py
  16. +1 −1 python/plugins/fTools/tools/doRandPoints.py
  17. +1 −1 python/plugins/fTools/tools/doRegPoints.py
  18. +1 −1 python/plugins/fTools/tools/doSpatialJoin.py
  19. +1 −1 python/plugins/fTools/tools/ftools_utils.py
  20. +1 −1 python/plugins/osm/OsmLoadDlg.py
  21. +1 −1 python/plugins/sextante/algs/ftools/ExportGeometryInfo.py
  22. +1 −1 python/plugins/sextante/algs/ftools/ftools_utils.py
  23. +1 −1 python/plugins/sextante/algs/mmqgisx/mmqgisx_library.py
  24. +1 −0 python/plugins/sextante/core/SextanteVectorWriter.py
  25. +4 −4 python/plugins/sextante/gdal/warp.py
  26. +4 −4 python/plugins/sextante/gui/CrsSelectionDialog.py
  27. +5 −5 python/plugins/sextante/gui/CrsSelectionPanel.py
  28. +2 −2 python/plugins/sextante/parameters/ParameterCrs.py
  29. +1 −2 python/plugins/sextante/tests/qgis_interface.py
  30. +2 −2 src/app/CMakeLists.txt
  31. +1 −1 src/app/legend/qgslegendlayer.cpp
  32. +54 −0 src/app/main.cpp
  33. +8 −4 src/app/qgisapp.cpp
  34. +1 −1 src/app/qgisapp.h
  35. +8 −4 src/app/qgsattributedialog.cpp
  36. +5 −0 src/app/qgsbrowserdockwidget.cpp
  37. +1 −1 src/app/qgsfieldsproperties.cpp
  38. +11 −5 src/app/qgsmergeattributesdialog.cpp
  39. +225 −7 src/app/qgsoptions.cpp
  40. +31 −3 src/app/qgsoptions.h
  41. +7 −0 src/core/CMakeLists.txt
  42. +2 −1 src/core/gps/tok.c
  43. +15 −0 src/core/qgsapplication.cpp
  44. +6 −1 src/core/qgsapplication.h
  45. +13 −2 src/core/qgsbrowsermodel.cpp
  46. +2 −3 src/core/qgsbrowsermodel.h
  47. +13 −0 src/core/qgsmaplayerregistry.cpp
  48. +3 −0 src/core/qgsmaplayerregistry.h
  49. +144 −0 src/core/qgsnetworkreplyparser.cpp
  50. +82 −0 src/core/qgsnetworkreplyparser.h
  51. +10 −3 src/core/qgsproject.cpp
  52. +5 −0 src/core/qgsproject.h
  53. +6 −0 src/core/qgsvectordataprovider.h
  54. +126 −87 src/core/qgsvectorlayer.cpp
  55. +6 −1 src/core/qgsvectorlayer.h
  56. +28 −4 src/core/qgsvectorlayerimport.cpp
  57. +7 −2 src/core/qgsvectorlayerimport.h
  58. 0 src/{providers/wfs → core}/qgswfsdata.cpp
  59. +13 −7 src/{providers/wfs → core}/qgswfsdata.h
  60. +6 −0 src/gui/attributetable/qgsattributetableidcolumnpair.cpp
  61. +19 −3 src/gui/qgsattributeeditor.cpp
  62. +1 −4 src/gui/qgssearchquerybuilder.cpp
  63. +1 −4 src/plugins/CMakeLists.txt
  64. +1 −1 src/plugins/sqlanywhere/sasourceselect.cpp
  65. +2 −5 src/providers/CMakeLists.txt
  66. +1 −1 src/providers/mssql/qgsmssqlprovider.cpp
  67. +2 −2 src/providers/mssql/qgsmssqlsourceselect.cpp
  68. +2 −2 src/providers/postgres/qgspgsourceselect.cpp
  69. +50 −8 src/providers/postgres/qgspostgresdataitems.cpp
  70. +4 −0 src/providers/postgres/qgspostgresdataitems.h
  71. +1 −1 src/providers/postgres/qgspostgresprovider.cpp
  72. +3 −1 src/providers/postgres/qgspostgresprovider.h
  73. +1 −1 src/providers/spatialite/qgsspatialitesourceselect.cpp
  74. +19 −84 src/providers/wcs/qgswcsprovider.cpp
  75. +0 −2 src/providers/wfs/CMakeLists.txt
  76. +10 −0 src/providers/wfs/qgswfscapabilities.cpp
  77. +1 −1 src/providers/wfs/qgswfscapabilities.h
  78. +1 −1 src/providers/wms/qgswmssourceselect.cpp
  79. +3,197 −2,840 src/ui/qgsoptionsbase.ui
@@ -161,7 +161,7 @@ ENDIF(NOT WIN32 AND NOT ANDROID)
FIND_PACKAGE(Proj)
FIND_PACKAGE(GEOS)
FIND_PACKAGE(GDAL)
FIND_PACKAGE(Expat)
FIND_PACKAGE(Expat REQUIRED)
FIND_PACKAGE(Spatialindex REQUIRED)
FIND_PACKAGE(Qwt REQUIRED)

26 INSTALL
@@ -1,10 +1,10 @@
Quantum GIS (QGIS)
Building QGIS from source - step by step
Tuesday October 23, 2012
Friday January 04, 2013


Last Updated: Tuesday October 23, 2012
Last Change : Tuesday October 23, 2012
Last Updated: Friday January 04, 2013
Last Change : Friday January 04, 2013


1. Introduction
@@ -104,13 +104,14 @@ Required build deps:
- Sqlite3 >= 3.0.0
- GDAL/OGR >= 1.4.x
- Qwt >= 5.0
- expat >= 1.95

Optional dependencies:

- for GRASS plugin - GRASS >= 6.0.0 (libraries compiled with exceptions support on Linux 32bit)
- for georeferencer - GSL >= 1.8
- for postgis support and SPIT plugin - PostgreSQL >= 8.0.x
- for gps plugin - expat >= 1.95 and gpsbabel
- for gps plugin - gpsbabel
- for mapserver export and PyQGIS - Python >= 2.3 (2.5+ preferred)
- for python support - SIP >= 4.8, PyQt >= must match Qt version, Qscintilla2
- for qgis mapserver - FastCGI
@@ -539,7 +540,7 @@ To run QGIS just use this command
==========================================

This section describes how to build QGIS using Visual Studio on Windows. This
is currently also who the binary QGIS packages are made (earlier versions used
is currently also how the binary QGIS packages are made (earlier versions used
MinGW).

This section describes the setup required to allow Visual Studio to be used to
@@ -608,7 +609,9 @@ 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.

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

4.1.3. 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
@@ -633,7 +636,6 @@ 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:

@@ -642,8 +644,8 @@ git to the source directory Quantum-GIS:
Create a 'build' directory somewhere. This will be where all the build output
will be generated.

Now run cmake-gui and in the Where is the source code: box, browse to
the top level QGIS directory.
Now run cmake-gui (still from cmd) and in the Where is the source code:
box, browse to the top level QGIS directory.

In the Where to build the binaries: box, browse to the 'build' directory you
created.
@@ -678,7 +680,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.3. Packaging
4.1.4. Packaging
================

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


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

Assuming you have completed the above packaging step, if you want to include
@@ -719,7 +721,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.5. Osgeo4w packaging
4.1.6. 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>Tuesday October 23, 2012</H3>
<H3>Friday January 04, 2013</H3>
</DIV>

<DIV CLASS="body" ID="body">
<P>
Last Updated: Tuesday October 23, 2012
Last Change : Tuesday October 23, 2012
Last Updated: Friday January 04, 2013
Last Change : Friday January 04, 2013
</P>
<DIV CLASS="toc">

@@ -211,6 +211,7 @@ <H1>2. Overview</H1>
<LI>Sqlite3 &gt;= 3.0.0
<LI>GDAL/OGR &gt;= 1.4.x
<LI>Qwt &gt;= 5.0
<LI>expat &gt;= 1.95
</UL>

<P>
@@ -221,7 +222,7 @@ <H1>2. Overview</H1>
<LI>for GRASS plugin - GRASS &gt;= 6.0.0 (libraries compiled with exceptions support on Linux 32bit)
<LI>for georeferencer - GSL &gt;= 1.8
<LI>for postgis support and SPIT plugin - PostgreSQL &gt;= 8.0.x
<LI>for gps plugin - expat &gt;= 1.95 and gpsbabel
<LI>for gps plugin - 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, Qscintilla2
<LI>for qgis mapserver - FastCGI
@@ -861,7 +862,7 @@ <H2>4.1. Building with Microsoft Visual Studio</H2>

<P>
This section describes how to build QGIS using Visual Studio on Windows. This
is currently also who the binary QGIS packages are made (earlier versions used
is currently also how the binary QGIS packages are made (earlier versions used
MinGW).
</P>
<P>
@@ -952,24 +953,30 @@ <H3>4.1.2. Other tools and dependencies</H3>
<LI>spatialite
<LI>libspatialindex-devel
<LI>python-qscintilla
<P></P>
</UL>

<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></P>
=== Setting up the Visual Studio project with CMake ===
<P></P>
</P>

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

<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
@@ -992,10 +999,10 @@ <H3>4.1.2. Other tools and dependencies</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>:
</UL>
</P>

<div class="code"><PRE>
git clone git://github.com/qgis/Quantum-GIS.git
@@ -1006,8 +1013,8 @@ <H3>4.1.2. Other tools and dependencies</H3>
will be generated.
</P>
<P>
Now run <CODE>cmake-gui</CODE> and in the <I>Where is the source code:</I> box, browse to
the top level QGIS directory.
Now run <CODE>cmake-gui</CODE> (still from <CODE>cmd</CODE>) and in the <I>Where is the source code:</I>
box, browse to the top level QGIS directory.
</P>
<P>
In the <I>Where to build the binaries:</I> box, browse to the 'build' directory you
@@ -1052,7 +1059,7 @@ <H3>4.1.2. Other tools and dependencies</H3>
directory or add their respective directories to your PATH.
</P>

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

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

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

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

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

<P>
The actual packaging process is currently not documented, for now please take a
@@ -3157,5 +3164,5 @@ <H1>9. 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 -odoc/INSTALL.html -t html doc/INSTALL.t2t -->
</BODY></HTML>

0 comments on commit 45fab4b

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