[QGIS Commit] [qgis/Quantum-GIS] 2aa8a5: postgres provider: use same precision in st_makeen...

GitHub noreply at github.com
Thu Apr 12 15:13:38 EDT 2012


  Branch: refs/heads/raster_resampler
  Home:   https://github.com/qgis/Quantum-GIS
  Commit: 2aa8a59c44ce3bd0e4572227d84837e942bbdd87
      https://github.com/qgis/Quantum-GIS/commit/2aa8a59c44ce3bd0e4572227d84837e942bbdd87
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    M src/providers/postgres/qgspostgresprovider.cpp

  Log Message:
  -----------
  postgres provider: use same precision in st_makeenvelope and BOX3D


  Commit: 985e4534b218f22242ad585fdd1e553f45f7b6e6
      https://github.com/qgis/Quantum-GIS/commit/985e4534b218f22242ad585fdd1e553f45f7b6e6
  Author: Werner Macho <werner.macho at gmail.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    M i18n/qgis_es.ts

  Log Message:
  -----------
  translation update: es by Carlos


  Commit: 8d4a656e4df3c516fea82ccf7d485f92b350d290
      https://github.com/qgis/Quantum-GIS/commit/8d4a656e4df3c516fea82ccf7d485f92b350d290
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    M python/core/qgsmaplayerregistry.sip
    M src/app/gps/qgsgpsinformationwidget.cpp
    M src/app/legend/qgslegend.cpp
    M src/app/legend/qgslegend.h
    M src/app/qgisapp.cpp
    M src/app/qgisapp.h
    M src/core/qgsmaplayerregistry.cpp
    M src/core/qgsmaplayerregistry.h
    M src/core/qgsproject.cpp

  Log Message:
  -----------
  [BACKPORT] to 1.8. Further improvements to multiple layer removal in one operation support for the registry and apply suggested improvements from Jürgen.


  Commit: 4a9e8ccb862225b73b89297d6467caf9f1bc0789
      https://github.com/qgis/Quantum-GIS/commit/4a9e8ccb862225b73b89297d6467caf9f1bc0789
  Author: szekerest <szekerest at gmail.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    M src/providers/mssql/qgsmssqlprovider.cpp

  Log Message:
  -----------
  MSSQL:Improve handling of datetime types (fixes #5283)


  Commit: 25988d67b188fc5a05eaa3d49abad7d2495aab4e
      https://github.com/qgis/Quantum-GIS/commit/25988d67b188fc5a05eaa3d49abad7d2495aab4e
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    M src/core/qgsdistancearea.cpp

  Log Message:
  -----------
  show acres after sq ft and before sq mile


  Commit: ae20835d7b107994252e9d7c963097a3a9330f1a
      https://github.com/qgis/Quantum-GIS/commit/ae20835d7b107994252e9d7c963097a3a9330f1a
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    M i18n/qgis_de.ts

  Log Message:
  -----------
  german translation update


  Commit: d830d537a67bc4850b069418cc06a547e6373b09
      https://github.com/qgis/Quantum-GIS/commit/d830d537a67bc4850b069418cc06a547e6373b09
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    M src/app/legend/qgslegend.cpp
    M src/app/qgsnewspatialitelayerdialog.cpp
    M src/browser/qgsbrowser.cpp
    M src/core/qgspluginlayerregistry.cpp
    M src/mapserver/qgswmsserver.cpp
    M src/plugins/georeferencer/qgsgeorefplugingui.cpp
    M src/plugins/offline_editing/offline_editing.cpp
    M src/plugins/roadgraph/exportdlg.cpp
    M src/plugins/spatialquery/qgsspatialquerydialog.cpp
    M src/plugins/sqlanywhere/sqlanywhere.cpp
    M tests/src/core/regression992.cpp
    M tests/src/core/testqgsmaprenderer.cpp
    M tests/src/core/testqgsrasterlayer.cpp
    M tests/src/core/testqgsrenderers.cpp
    M tests/src/core/testqgsvectorlayer.cpp

  Log Message:
  -----------
  [BACKPORT] to 1.8. Remove deprecated use of map layer registry addLayer and removeLayer elsewhere in code base


  Commit: 8784981c8faa63d6cf3fd9750ef44e436bf64e3e
      https://github.com/qgis/Quantum-GIS/commit/8784981c8faa63d6cf3fd9750ef44e436bf64e3e
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    M i18n/qgis_de.ts
    M src/core/qgsdistancearea.cpp
    M src/providers/mssql/qgsmssqlprovider.cpp

  Log Message:
  -----------
  Merge branch 'master' of github.com:qgis/Quantum-GIS


  Commit: 0353514182b4c806e1ef2dd670ec5781468d87df
      https://github.com/qgis/Quantum-GIS/commit/0353514182b4c806e1ef2dd670ec5781468d87df
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    M src/app/legend/qgslegend.cpp
    M src/browser/qgsbrowser.cpp
    M src/core/qgspluginlayerregistry.cpp
    M src/mapserver/qgswmsserver.cpp
    M src/plugins/georeferencer/qgsgeorefplugingui.cpp
    M src/plugins/offline_editing/offline_editing.cpp
    M src/plugins/spatialquery/qgsspatialquerydialog.cpp
    M tests/src/core/testqgsmaprenderer.cpp
    M tests/src/core/testqgsrasterlayer.cpp
    M tests/src/core/testqgsrenderers.cpp
    M tests/src/core/testqgsvectorlayer.cpp

  Log Message:
  -----------
  indentation update


  Commit: bd916b1bf96a622f341e8fb5500ccbc50d37c4fe
      https://github.com/qgis/Quantum-GIS/commit/bd916b1bf96a622f341e8fb5500ccbc50d37c4fe
  Author: William Kyngesburye <kyngchaos at kyngchaos.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    A doc/INSTALL
    M doc/INSTALL.html
    M doc/osx.t2t

  Log Message:
  -----------
  OS X install updates


  Commit: 2a126af2e591e417f3747173a5885dade225df4a
      https://github.com/qgis/Quantum-GIS/commit/2a126af2e591e417f3747173a5885dade225df4a
  Author: William Kyngesburye <kyngchaos at kyngchaos.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    M INSTALL
    R doc/INSTALL

  Log Message:
  -----------
  fix bd916b1


  Commit: fdceb2fc230942267c89818d543a7ae1f5685c77
      https://github.com/qgis/Quantum-GIS/commit/fdceb2fc230942267c89818d543a7ae1f5685c77
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2012-04-05 (Thu, 05 Apr 2012)

  Changed paths:
    M src/core/qgscoordinatereferencesystem.cpp

  Log Message:
  -----------
  also get crs record count readonly (follows up 9154e4e)


  Commit: 30eaf192e731aeaa74780123ada445bfda971737
      https://github.com/qgis/Quantum-GIS/commit/30eaf192e731aeaa74780123ada445bfda971737
  Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
  Date:   2012-04-06 (Fri, 06 Apr 2012)

  Changed paths:
    M src/app/legend/qgslegend.cpp

  Log Message:
  -----------
  Zoom to layer extent when adding the first layer


  Commit: 55d92681d7eef2b1ad43ab299bb8da20542b3c24
      https://github.com/qgis/Quantum-GIS/commit/55d92681d7eef2b1ad43ab299bb8da20542b3c24
  Author: giohappy <giohappy at gmail.com>
  Date:   2012-04-06 (Fri, 06 Apr 2012)

  Changed paths:
    M src/core/qgsdistancearea.cpp

  Log Message:
  -----------
  Update src/core/qgsdistancearea.cpp


  Commit: 845856e637c8741ebcefa877db14e202e9a3c45d
      https://github.com/qgis/Quantum-GIS/commit/845856e637c8741ebcefa877db14e202e9a3c45d
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-04-06 (Fri, 06 Apr 2012)

  Changed paths:
    M python/core/qgis.sip
    M src/core/qgis.h

  Log Message:
  -----------
  [BACKPORT] Naming consistency for GEOWkt global (renamed to GEOWKT)


  Commit: 6adf0f8037a6ab0f219df8d573691b09b73b5abe
      https://github.com/qgis/Quantum-GIS/commit/6adf0f8037a6ab0f219df8d573691b09b73b5abe
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-04-06 (Fri, 06 Apr 2012)

  Changed paths:
    M src/core/qgscoordinatereferencesystem.cpp
    M tests/src/core/qgsrenderchecker.cpp
    M tests/src/core/qgsrenderchecker.h
    M tests/src/core/regression1141.cpp
    M tests/src/core/regression992.cpp
    M tests/src/core/testqgscoordinatereferencesystem.cpp
    M tests/src/core/testqgsmaprenderer.cpp
    M tests/src/core/testqgsvectorfilewriter.cpp
    M tests/testdata/expected_landsat_875.png

  Log Message:
  -----------
  [BACKPORT] in progress test updates / fixes


  Commit: 4d928f661989e5583ec9960df2e456e5613f3b63
      https://github.com/qgis/Quantum-GIS/commit/4d928f661989e5583ec9960df2e456e5613f3b63
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-04-06 (Fri, 06 Apr 2012)

  Changed paths:
    M tests/src/core/testqgscoordinatereferencesystem.cpp

  Log Message:
  -----------
  3 coordinate system test failures left


  Commit: 26322b6a3df271fb373fe4d9e22bb3fbb4cced50
      https://github.com/qgis/Quantum-GIS/commit/26322b6a3df271fb373fe4d9e22bb3fbb4cced50
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-04-06 (Fri, 06 Apr 2012)

  Changed paths:
    M src/core/qgscoordinatereferencesystem.h
    M tests/src/core/testqgscoordinatereferencesystem.cpp

  Log Message:
  -----------
  One CRS test failure left


  Commit: 1f43afd9ef6c0d194622a8a4d93cd7fa8d747a79
      https://github.com/qgis/Quantum-GIS/commit/1f43afd9ef6c0d194622a8a4d93cd7fa8d747a79
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-04-06 (Fri, 06 Apr 2012)

  Changed paths:
    M src/core/qgscoordinatereferencesystem.cpp
    M tests/src/core/testqgscoordinatereferencesystem.cpp

  Log Message:
  -----------
  1 remaining test fails in CRS tests


  Commit: 4524023fe1724ec83bc0f669c3c3bf2571a04ec6
      https://github.com/qgis/Quantum-GIS/commit/4524023fe1724ec83bc0f669c3c3bf2571a04ec6
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-04-07 (Sat, 07 Apr 2012)

  Changed paths:
    M src/core/qgscoordinatereferencesystem.cpp

  Log Message:
  -----------
  Changed the way equality tests are done in qgscoordinatereference system. Simply comparing WKT's is not effective since the same CRS can be expressed in different ways. Now we compare the authid (which may have some side effects but probably less than the old system. All qgscoordinatereferencesystem tests pass now.


  Commit: 6403ebdd1addc3b1af9e7969672834fb7e9553bc
      https://github.com/qgis/Quantum-GIS/commit/6403ebdd1addc3b1af9e7969672834fb7e9553bc
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2012-04-07 (Sat, 07 Apr 2012)

  Changed paths:
    M src/app/qgisapp.cpp

  Log Message:
  -----------
  fix add/remove layers connections (follows up f9ed6d4)


  Commit: 3c0f3f091b0861801c3cd191c9d6528bb6213d76
      https://github.com/qgis/Quantum-GIS/commit/3c0f3f091b0861801c3cd191c9d6528bb6213d76
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-04-07 (Sat, 07 Apr 2012)

  Changed paths:
    M tests/testdata/expected_maprender.png
    M tests/testdata/maprender_testdata.qml

  Log Message:
  -----------
  Update control image and qml for map renderer test - all renderer tests now pass for me.


  Commit: a82a2438e1b9bb4656d2a63ef21800d1d2a01ff2
      https://github.com/qgis/Quantum-GIS/commit/a82a2438e1b9bb4656d2a63ef21800d1d2a01ff2
  Author: Nathan Woodrow <woodrow.nathan at gmail.com>
  Date:   2012-04-07 (Sat, 07 Apr 2012)

  Changed paths:
    M src/app/qgssnappingdialog.cpp
    M src/app/qgssnappingdialog.h

  Log Message:
  -----------
  Remove/Add layers to snapping dialog.  Fixes #5318


  Commit: 8ae8e1596c6500bece96c892eba9de99d7ba66d9
      https://github.com/qgis/Quantum-GIS/commit/8ae8e1596c6500bece96c892eba9de99d7ba66d9
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-04-07 (Sat, 07 Apr 2012)

  Changed paths:
    M src/core/qgsmaplayerregistry.cpp

  Log Message:
  -----------
  Emit layer added signals in addMapLayers method of layer registry


  Commit: 73269255a35166724f688389fe1d8803240de6f4
      https://github.com/qgis/Quantum-GIS/commit/73269255a35166724f688389fe1d8803240de6f4
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-04-07 (Sat, 07 Apr 2012)

  Changed paths:
    M src/app/qgisapp.cpp
    M src/app/qgssnappingdialog.cpp
    M src/app/qgssnappingdialog.h

  Log Message:
  -----------
  Merge branch 'master' of github.com:qgis/Quantum-GIS


  Commit: 712cab92d18164f84f800866ce0c2356aa9a3bd0
      https://github.com/qgis/Quantum-GIS/commit/712cab92d18164f84f800866ce0c2356aa9a3bd0
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-04-07 (Sat, 07 Apr 2012)

  Changed paths:
    M tests/src/core/testqgscoordinatereferencesystem.cpp

  Log Message:
  -----------
  Use more appropriate global for createFromId CRS test


  Commit: b7e2387426ba6b61508aa7abf0182aea7bb08797
      https://github.com/qgis/Quantum-GIS/commit/b7e2387426ba6b61508aa7abf0182aea7bb08797
  Author: William Kyngesburye <kyngchaos at kyngchaos.com>
  Date:   2012-04-07 (Sat, 07 Apr 2012)

  Changed paths:
    M mac/cmake/1qt.cmake.in

  Log Message:
  -----------
  Qt bundling cleanup


  Commit: 48be08be33c49ecc4d31f48b9f3aa2e281b52786
      https://github.com/qgis/Quantum-GIS/commit/48be08be33c49ecc4d31f48b9f3aa2e281b52786
  Author: William Kyngesburye <kyngchaos at kyngchaos.com>
  Date:   2012-04-07 (Sat, 07 Apr 2012)

  Changed paths:
    M mac/cmake/1qt.cmake.in

  Log Message:
  -----------
  Don't bundle PyQwt if not present in system


  Commit: 4ecd56886cd08ab96cebd8bf9a6a3edd1c55b822
      https://github.com/qgis/Quantum-GIS/commit/4ecd56886cd08ab96cebd8bf9a6a3edd1c55b822
  Author: William Kyngesburye <kyngchaos at kyngchaos.com>
  Date:   2012-04-07 (Sat, 07 Apr 2012)

  Changed paths:
    M CMakeLists.txt
    M mac/CMakeLists.txt
    A mac/cmake/1osg.cmake.in
    M src/plugins/globe/globe_plugin.cpp

  Log Message:
  -----------
  Add bundling of osg/osgEarth for OS X app


  Commit: 59a08c41096a507d3a29bf82079766a62f12c94f
      https://github.com/qgis/Quantum-GIS/commit/59a08c41096a507d3a29bf82079766a62f12c94f
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2012-04-07 (Sat, 07 Apr 2012)

  Changed paths:
    M cmake/SIPMacros.cmake

  Log Message:
  -----------
  fix #5331


  Commit: eca69c2cf3fcc464c887dca759c7609f67b29e9d
      https://github.com/qgis/Quantum-GIS/commit/eca69c2cf3fcc464c887dca759c7609f67b29e9d
  Author: William Kyngesburye <kyngchaos at kyngchaos.com>
  Date:   2012-04-07 (Sat, 07 Apr 2012)

  Changed paths:
    M INSTALL
    M doc/INSTALL.html
    M doc/osx.t2t

  Log Message:
  -----------
  OS X install update - osgearth and globe plugin


  Commit: 051749a495b4ea00bab378d88e0ce049f30d4abc
      https://github.com/qgis/Quantum-GIS/commit/051749a495b4ea00bab378d88e0ce049f30d4abc
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2012-04-07 (Sat, 07 Apr 2012)

  Changed paths:
    M src/core/gps/qgsgpsdconnection.cpp

  Log Message:
  -----------
  raw only won't work with GPSes that don't speak NMEA (should fix #4050)


  Commit: bbf471eee70f5bf24c581e9c97422843a04e878c
      https://github.com/qgis/Quantum-GIS/commit/bbf471eee70f5bf24c581e9c97422843a04e878c
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-04-08 (Sun, 08 Apr 2012)

  Changed paths:
    M tests/src/core/qgsrenderchecker.cpp
    M tests/testdata/expected_continuous.png
    M tests/testdata/expected_graduated.png
    M tests/testdata/expected_landsat_875.png
    M tests/testdata/expected_landsat_basic.png
    M tests/testdata/expected_raster_pseudo.png
    M tests/testdata/expected_single.png
    M tests/testdata/expected_uniquevalue.png

  Log Message:
  -----------
  Renderer tests passing now


  Commit: 413c703335a75a7328c864029e598b863c9c6db7
      https://github.com/qgis/Quantum-GIS/commit/413c703335a75a7328c864029e598b863c9c6db7
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-04-08 (Sun, 08 Apr 2012)

  Changed paths:
    M CMakeLists.txt
    M INSTALL
    M cmake/SIPMacros.cmake
    M doc/INSTALL.html
    M doc/osx.t2t
    M mac/CMakeLists.txt
    A mac/cmake/1osg.cmake.in
    M mac/cmake/1qt.cmake.in
    M src/core/gps/qgsgpsdconnection.cpp
    M src/plugins/globe/globe_plugin.cpp

  Log Message:
  -----------
  Merge branch 'master' of github.com:qgis/Quantum-GIS


  Commit: 4590397f7fa1ad4081cdac2f78f2f38b89968314
      https://github.com/qgis/Quantum-GIS/commit/4590397f7fa1ad4081cdac2f78f2f38b89968314
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-04-08 (Sun, 08 Apr 2012)

  Changed paths:
    M tests/testdata/expected_landsat_basic.png
    M tests/testdata/expected_raster.png
    M tests/testdata/expected_raster_pseudo.png

  Log Message:
  -----------
  Replaced raster test images so all tests pass


  Commit: 8465bdc741ee05a3e167bba70f4f0325ac66ef05
      https://github.com/qgis/Quantum-GIS/commit/8465bdc741ee05a3e167bba70f4f0325ac66ef05
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-04-08 (Sun, 08 Apr 2012)

  Changed paths:
    A scripts/remove_git_confict_files.sh
    R scripts/remove_svn_conflict_files.sh

  Log Message:
  -----------
  Revise script to get rid of orig files


  Commit: ceae2a76613c64d39ec5e89a175e7845219919b1
      https://github.com/qgis/Quantum-GIS/commit/ceae2a76613c64d39ec5e89a175e7845219919b1
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-04-08 (Sun, 08 Apr 2012)

  Changed paths:
    A tests/testdata/landsat.tif.aux.xml
    A tests/testdata/tenbytenraster.asc.aux.xml

  Log Message:
  -----------
  Added test datasets aux.xml files for what its worth


  Commit: 4b8ab18829050151d18c200d541c68dda510089f
      https://github.com/qgis/Quantum-GIS/commit/4b8ab18829050151d18c200d541c68dda510089f
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-04-08 (Sun, 08 Apr 2012)

  Changed paths:
    M CMakeLists.txt

  Log Message:
  -----------
  Added verbose output on test failure to make check command


  Commit: b9bf17efffb1eecb3230e666e269f8f5baf18c25
      https://github.com/qgis/Quantum-GIS/commit/b9bf17efffb1eecb3230e666e269f8f5baf18c25
  Author: William Kyngesburye <kyngchaos at kyngchaos.com>
  Date:   2012-04-08 (Sun, 08 Apr 2012)

  Changed paths:
    M INSTALL
    M doc/INSTALL.html
    M doc/osx.t2t
    M doc/style.css

  Log Message:
  -----------
  OS X install cleanup, fill in more dependencies;
adjust header styles for better readability


  Commit: aa6d5b34516f72477e24f776b030867e6785cb59
      https://github.com/qgis/Quantum-GIS/commit/aa6d5b34516f72477e24f776b030867e6785cb59
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-04-08 (Sun, 08 Apr 2012)

  Changed paths:
    M tests/src/core/testqgscoordinatereferencesystem.cpp

  Log Message:
  -----------
  Better diagnostics for CRS tests debug output


  Commit: d1a11bec96db0fee744529a98023e7be252222c4
      https://github.com/qgis/Quantum-GIS/commit/d1a11bec96db0fee744529a98023e7be252222c4
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-04-08 (Sun, 08 Apr 2012)

  Changed paths:
    M CMakeLists.txt

  Log Message:
  -----------
  Added make-no-x options (experimental) for running unit tests on a headless server.


  Commit: 95045f86f71b8b102a5301bb44be0f33304ad966
      https://github.com/qgis/Quantum-GIS/commit/95045f86f71b8b102a5301bb44be0f33304ad966
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2012-04-09 (Mon, 09 Apr 2012)

  Changed paths:
    M src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp

  Log Message:
  -----------
  fix #5333


  Commit: e54e87f6376ad5ad78e0155b64917a3b55c51079
      https://github.com/qgis/Quantum-GIS/commit/e54e87f6376ad5ad78e0155b64917a3b55c51079
  Author: Werner Macho <werner.macho at gmail.com>
  Date:   2012-04-09 (Mon, 09 Apr 2012)

  Changed paths:
    M i18n/qgis_et.ts

  Log Message:
  -----------
  translation update: et by veiko


  Commit: 67c77e5532d7910571b4c84bb4dce3000a0cb359
      https://github.com/qgis/Quantum-GIS/commit/67c77e5532d7910571b4c84bb4dce3000a0cb359
  Author: dakcarto <larrys at dakotacarto.com>
  Date:   2012-04-09 (Mon, 09 Apr 2012)

  Changed paths:
    M python/CMakeLists.txt

  Log Message:
  -----------
  Added SIP generation to build/python directory of API files for QScintilla code completion/call tips.

Signed-off-by: Tim Sutton <tim at linfiniti.com>


  Commit: 1f90bc63865ac699094dc6f54720549ec8b9c941
      https://github.com/qgis/Quantum-GIS/commit/1f90bc63865ac699094dc6f54720549ec8b9c941
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-04-12 (Thu, 12 Apr 2012)

  Changed paths:
    M CMakeLists.txt
    M INSTALL
    M cmake/FindProj.cmake
    A cmake/FindQtMobility.cmake
    M cmake/MacBundleMacros.cmake
    M cmake/SIPMacros.cmake
    M cmake_templates/qgsconfig.h.in
    M debian/changelog
    R debian/compat.hardy
    R debian/compat.intrepid
    R debian/compat.jaunty
    R debian/compat.karmic
    A debian/compat.precise
    M debian/compat.sid
    A debian/compat.wheezy
    R debian/control.hardy
    R debian/control.intrepid
    R debian/control.jaunty
    R debian/control.karmic
    A debian/control.precise
    M debian/control.sid
    M debian/control.squeeze
    A debian/control.wheezy
    M debian/copyright
    M debian/libqgis{QGIS_ABI}.lintian-overrides
    A debian/qbrowser.desktop
    A debian/qgis-providers-common.postinst
    M debian/qgis-providers.install
    M debian/qgis.desktop
    M debian/qgis.install
    M debian/rules
    M doc/AUTHORS
    M doc/CODING.t2t
    M doc/CONTRIBUTORS
    M doc/INSTALL.html
    M doc/TRANSLATORS
    M doc/osx.t2t
    M doc/style.css
    M i18n/qgis_af.ts
    M i18n/qgis_ar.ts
    M i18n/qgis_bg.ts
    M i18n/qgis_ca_ES.ts
    M i18n/qgis_cs_CZ.ts
    M i18n/qgis_de.ts
    M i18n/qgis_el_GR.ts
    M i18n/qgis_es.ts
    M i18n/qgis_et.ts
    M i18n/qgis_fa.ts
    M i18n/qgis_fi.ts
    M i18n/qgis_fr.ts
    M i18n/qgis_gl_ES.ts
    M i18n/qgis_he.ts
    M i18n/qgis_hr_HR.ts
    M i18n/qgis_hu.ts
    M i18n/qgis_id.ts
    M i18n/qgis_is.ts
    M i18n/qgis_it.ts
    M i18n/qgis_ja.ts
    M i18n/qgis_ka_GE.ts
    A i18n/qgis_ko_KR.ts
    M i18n/qgis_lo.ts
    M i18n/qgis_lt.ts
    M i18n/qgis_lv.ts
    M i18n/qgis_mn.ts
    M i18n/qgis_nl.ts
    M i18n/qgis_no.ts
    M i18n/qgis_pl_PL.ts
    M i18n/qgis_pt_BR.ts
    M i18n/qgis_pt_PT.ts
    M i18n/qgis_ro.ts
    M i18n/qgis_ru.ts
    M i18n/qgis_sk.ts
    M i18n/qgis_sl_SI.ts
    M i18n/qgis_sq_AL.ts
    M i18n/qgis_sr_CS-Latn.ts
    M i18n/qgis_sv.ts
    M i18n/qgis_ta.ts
    M i18n/qgis_th.ts
    M i18n/qgis_tr.ts
    M i18n/qgis_uk.ts
    M i18n/qgis_vi.ts
    M i18n/qgis_xh.ts
    M i18n/qgis_zh_CN.ts
    M i18n/qgis_zh_TW.ts
    M images/images.qrc
    A images/themes/classic/mActionTouch.png
    M images/themes/default/CMakeLists.txt
    A images/themes/default/mActionAddMssqlLayer.png
    A images/themes/default/mActionOffsetCurve.png
    A images/themes/default/mActionPanToSelected.png
    A images/themes/default/mActionTouch.png
    A images/themes/default/mIconConnect.png
    A images/themes/default/mIconDbSchema.png
    A images/themes/default/mIconFavourites.png
    A images/themes/default/mIconMssql.png
    A images/themes/default/mIconPostgis.png
    A images/themes/default/mIconRaster.png
    A images/themes/default/mIconSpatialite.png
    A images/themes/default/mIconWarn.png
    A images/themes/default/mIconWfs.png
    A images/themes/default/propertyicons/gdal.png
    R images/themes/default/propertyicons/gdal.png
    A images/themes/gis/mActionPanToSelected.png
    A images/themes/gis/mActionTouch.png
    A images/themes/gis/mIconMssql.png
    M mac/CMakeLists.txt
    A mac/cmake/1osg.cmake.in
    M mac/cmake/1qt.cmake.in
    M mac/cmake/2lib.cmake.in
    M ms-windows/osgeo4w/package-nightly.cmd
    M ms-windows/osgeo4w/package.cmd
    M ms-windows/osgeo4w/qgis.bat.tmpl
    M ms-windows/python_plugins.nsh
    M python/CMakeLists.txt
    M python/analysis/analysis.sip
    M python/analysis/network/qgsgraphanalyzer.sip
    M python/analysis/qgsgeometryanalyzer.sip
    M python/core/conversions.sip
    M python/core/core.sip
    M python/core/qgis.sip
    M python/core/qgscomposeritem.sip
    M python/core/qgscomposerlabel.sip
    M python/core/qgscomposershape.sip
    M python/core/qgscomposition.sip
    M python/core/qgscoordinatereferencesystem.sip
    M python/core/qgscoordinatetransform.sip
    A python/core/qgsexception.sip
    M python/core/qgsexpression.sip
    M python/core/qgsfeature.sip
    A python/core/qgsgpsconnection.sip
    A python/core/qgsgpsconnectionregistry.sip
    A python/core/qgsgpsdconnection.sip
    A python/core/qgsgpsdetector.sip
    M python/core/qgsmaplayer.sip
    M python/core/qgsmaplayerregistry.sip
    M python/core/qgsmessagelog.sip
    M python/core/qgsnetworkaccessmanager.sip
    A python/core/qgsnmeaconnection.sip
    M python/core/qgsrect.sip
    M python/core/qgsvectordataprovider.sip
    M python/core/qgsvectorlayer.sip
    M python/core/symbology-ng-core.sip
    M python/gui/gui.sip
    M python/gui/qgisinterface.sip
    M python/gui/qgscomposerview.sip
    M python/gui/qgsgenericprojectionselector.sip
    M python/gui/qgsmapcanvas.sip
    A python/gui/qgsscalecombobox.sip
    M python/gui/symbology-ng-gui.sip
    M python/plugins/GdalTools/GdalTools.py
    M python/plugins/GdalTools/__init__.py
    M python/plugins/GdalTools/tools/dialogSRS.py
    M python/plugins/GdalTools/tools/doBuildVRT.py
    M python/plugins/GdalTools/tools/doClipper.py
    M python/plugins/GdalTools/tools/doExtractProj.py
    M python/plugins/GdalTools/tools/doMerge.py
    M python/plugins/GdalTools/tools/doProjection.py
    M python/plugins/GdalTools/tools/doTranslate.py
    M python/plugins/GdalTools/tools/doWarp.py
    M python/plugins/GdalTools/tools/widgetBatchBase.py
    M python/plugins/GdalTools/tools/widgetBuildVRT.ui
    M python/plugins/GdalTools/tools/widgetMerge.ui
    M python/plugins/GdalTools/tools/widgetPluginBase.py
    M python/plugins/fTools/__init__.py
    M python/plugins/fTools/fTools.py
    A python/plugins/fTools/icons/gis/merge_shapes.png
    M python/plugins/fTools/resources.qrc
    M python/plugins/fTools/tools/doDefineProj.py
    M python/plugins/fTools/tools/doGeometry.py
    M python/plugins/fTools/tools/doGeoprocessing.py
    M python/plugins/fTools/tools/doIntersectLines.py
    M python/plugins/fTools/tools/doMeanCoords.py
    M python/plugins/fTools/tools/doMergeShapes.py
    M python/plugins/fTools/tools/doPointDistance.py
    M python/plugins/fTools/tools/doPointsInPolygon.py
    M python/plugins/fTools/tools/doRandPoints.py
    M python/plugins/fTools/tools/doRandom.py
    M python/plugins/fTools/tools/doRegPoints.py
    M python/plugins/fTools/tools/doSelectByLocation.py
    M python/plugins/fTools/tools/doSimplify.py
    M python/plugins/fTools/tools/doSpatialIndex.py
    M python/plugins/fTools/tools/doSpatialJoin.py
    M python/plugins/fTools/tools/doSubsetSelect.py
    M python/plugins/fTools/tools/doSumLines.py
    M python/plugins/fTools/tools/doValidate.py
    M python/plugins/fTools/tools/doVectorGrid.py
    M python/plugins/fTools/tools/doVectorSplit.py
    M python/plugins/fTools/tools/doVisual.py
    M python/plugins/fTools/tools/frmGeometry.ui
    M python/plugins/fTools/tools/frmVectorGrid.ui
    M python/plugins/mapserver_export/__init__.py
    M python/plugins/mapserver_export/mapserverexport.py
    M python/plugins/mapserver_export/mapserverexportdialog.py
    M python/plugins/osm/OsmAddRelationDlg.py
    M python/plugins/osm/OsmDownloadDlg.py
    M python/plugins/osm/OsmImportDlg.py
    M python/plugins/osm/OsmLoadDlg.py
    M python/plugins/osm/OsmPlugin.py
    M python/plugins/osm/OsmSaveDlg.py
    M python/plugins/osm/OsmUploadDlg.py
    M python/plugins/osm/__init__.py
    M python/plugins/plugin_installer/__init__.py
    M python/plugins/plugin_installer/installer_gui.py
    M python/plugins/plugin_installer/installer_plugin.py
    M python/pyspatialite/CMakeLists.txt
    M qbrowser.1
    M qgis.1
    A resources/context_help/HeatmapGui-de_DE
    A resources/context_help/HeatmapGui-en_US
    M resources/context_help/QgsFieldCalculator-en_US
    A resources/context_help/QgsFieldCalculator-ru_RU
    M resources/context_help/QgsVectorLayerProperties-en_US
    A resources/function_help/Conversions-de_DE
    A resources/function_help/Conversions-en_US
    A resources/function_help/Field-de_DE
    A resources/function_help/Field-en_US
    A resources/function_help/Fields and Values-de_DE	
    A resources/function_help/Fields and Values-en_US	
    A resources/function_help/Geometry-de_DE
    A resources/function_help/Geometry-en_US
    A resources/function_help/Math-de_DE
    A resources/function_help/Math-en_US
    A resources/function_help/Operators-de_DE
    A resources/function_help/Operators-en_US
    A resources/function_help/Record-de_DE
    A resources/function_help/Record-en_US
    A resources/function_help/String-de_DE
    A resources/function_help/String-en_US
    M resources/srs.db
    M scripts/astyle-all.sh
    M scripts/chkspelling.sh
    A scripts/remove_git_confict_files.sh
    R scripts/remove_svn_conflict_files.sh
    M scripts/spelling.dat
    M scripts/tsstat.pl
    M src/CMakeLists.txt
    M src/analysis/CMakeLists.txt
    M src/analysis/interpolation/ParametricLine.cc
    M src/analysis/interpolation/TriDecorator.h
    M src/analysis/network/qgsgraphanalyzer.cpp
    M src/analysis/network/qgsgraphanalyzer.h
    M src/analysis/raster/qgsaspectfilter.h
    M src/analysis/raster/qgsderivativefilter.cpp
    A src/analysis/raster/qgshillshadefilter.cpp
    A src/analysis/raster/qgshillshadefilter.h
    M src/analysis/raster/qgsninecellfilter.cpp
    M src/analysis/raster/qgsninecellfilter.h
    M src/analysis/raster/qgsrastercalcparser.yy
    A src/analysis/raster/qgsrelief.cpp
    A src/analysis/raster/qgsrelief.h
    M src/analysis/raster/qgsruggednessfilter.h
    M src/analysis/raster/qgsslopefilter.h
    M src/analysis/vector/qgsgeometryanalyzer.cpp
    M src/analysis/vector/qgsgeometryanalyzer.h
    M src/analysis/vector/qgszonalstatistics.cpp
    M src/app/CMakeLists.txt
    R src/app/attributetable/qgsattributetabledialog.cpp
    R src/app/attributetable/qgsattributetabledialog.h
    M src/app/composer/qgscomposer.cpp
    M src/app/composer/qgscomposer.h
    M src/app/composer/qgscomposeritemwidget.cpp
    M src/app/composer/qgscomposerlabelwidget.cpp
    M src/app/composer/qgscomposerlegendwidget.cpp
    M src/app/composer/qgscomposerlegendwidget.h
    M src/app/composer/qgscomposermanager.cpp
    M src/app/composer/qgscomposermapwidget.cpp
    M src/app/composer/qgscomposermapwidget.h
    M src/app/composer/qgscomposerpicturewidget.cpp
    M src/app/composer/qgscomposerpicturewidget.h
    M src/app/gps/qgsgpsinformationwidget.cpp
    M src/app/legend/qgsapplegendinterface.cpp
    M src/app/legend/qgslegend.cpp
    M src/app/legend/qgslegend.h
    M src/app/legend/qgslegendlayer.cpp
    M src/app/main.cpp
    A src/app/nodetool/qgsmaptoolnodetool.cpp
    A src/app/nodetool/qgsmaptoolnodetool.h
    A src/app/nodetool/qgsselectedfeature.cpp
    A src/app/nodetool/qgsselectedfeature.h
    A src/app/nodetool/qgsvertexentry.cpp
    A src/app/nodetool/qgsvertexentry.h
    M src/app/ogr/qgsnewogrconnection.cpp
    M src/app/ogr/qgsogrhelperfunctions.cpp
    M src/app/ogr/qgsogrsublayersdialog.cpp
    M src/app/ogr/qgsopenvectorlayerdialog.cpp
    M src/app/ogr/qgsvectorlayersaveasdialog.cpp
    M src/app/ogr/qgsvectorlayersaveasdialog.h
    M src/app/qgisapp.cpp
    M src/app/qgisapp.h
    M src/app/qgisappinterface.cpp
    M src/app/qgisappinterface.h
    M src/app/qgsabout.cpp
    M src/app/qgsabout.h
    M src/app/qgsaddattrdialog.cpp
    M src/app/qgsaddattrdialog.h
    M src/app/qgsattributeactiondialog.cpp
    M src/app/qgsattributeactiondialog.h
    A src/app/qgsattributetabledialog.cpp
    A src/app/qgsattributetabledialog.h
    M src/app/qgsattributetypedialog.cpp
    R src/app/qgsbookmarkitem.cpp
    R src/app/qgsbookmarkitem.h
    M src/app/qgsbookmarks.cpp
    M src/app/qgsbookmarks.h
    M src/app/qgsbrowserdockwidget.cpp
    M src/app/qgsbrowserdockwidget.h
    M src/app/qgsclipboard.cpp
    M src/app/qgsclipboard.h
    M src/app/qgsconfigureshortcutsdialog.cpp
    M src/app/qgscustomization.cpp
    M src/app/qgscustomization.h
    M src/app/qgscustomprojectiondialog.cpp
    M src/app/qgsdecorationcopyrightdialog.cpp
    M src/app/qgsdecorationnortharrowdialog.cpp
    M src/app/qgsdecorationscalebardialog.cpp
    M src/app/qgsembedlayerdialog.cpp
    M src/app/qgsfeatureaction.cpp
    M src/app/qgsfeatureaction.h
    M src/app/qgsfieldcalculator.cpp
    M src/app/qgsfieldcalculator.h
    M src/app/qgshighlight.cpp
    M src/app/qgsidentifyresults.cpp
    M src/app/qgslabelinggui.cpp
    M src/app/qgslabelpreview.h
    M src/app/qgsmaptooladdfeature.cpp
    M src/app/qgsmaptooladdpart.cpp
    M src/app/qgsmaptoolcapture.cpp
    M src/app/qgsmaptoolcapture.h
    A src/app/qgsmaptoolfeatureaction.cpp
    A src/app/qgsmaptoolfeatureaction.h
    M src/app/qgsmaptoolidentify.cpp
    M src/app/qgsmaptoolmovefeature.cpp
    R src/app/qgsmaptoolnodetool.cpp
    R src/app/qgsmaptoolnodetool.h
    A src/app/qgsmaptooloffsetcurve.cpp
    A src/app/qgsmaptooloffsetcurve.h
    M src/app/qgsmaptoolrotatepointsymbols.cpp
    M src/app/qgsmaptoolrotatepointsymbols.h
    M src/app/qgsmergeattributesdialog.cpp
    A src/app/qgsnewspatialitelayerdialog.cpp
    A src/app/qgsnewspatialitelayerdialog.h
    M src/app/qgsoptions.cpp
    M src/app/qgsoptions.h
    M src/app/qgspluginitem.cpp
    M src/app/qgspluginitem.h
    M src/app/qgspluginmanager.cpp
    M src/app/qgspluginregistry.cpp
    M src/app/qgsprojectproperties.cpp
    M src/app/qgsprojectproperties.h
    M src/app/qgsrastercalcdialog.cpp
    M src/app/qgsrasterlayerproperties.cpp
    M src/app/qgssinglesymboldialog.cpp
    M src/app/qgssnappingdialog.cpp
    M src/app/qgssnappingdialog.h
    M src/app/qgssponsors.cpp
    M src/app/qgssponsors.h
    M src/app/qgstipfactory.cpp
    M src/app/qgsundowidget.cpp
    M src/app/qgsvectorlayerproperties.cpp
    M src/app/qgsvectorlayerproperties.h
    R src/app/spatialite/qgsnewspatialitelayerdialog.cpp
    R src/app/spatialite/qgsnewspatialitelayerdialog.h
    R src/app/spatialite/qgsspatialitesridsdialog.cpp
    R src/app/spatialite/qgsspatialitesridsdialog.h
    M src/browser/qgsbrowser.cpp
    M src/core/CMakeLists.txt
    M src/core/composer/qgscomposeritem.h
    M src/core/composer/qgscomposeritemcommand.h
    M src/core/composer/qgscomposerlabel.h
    M src/core/composer/qgscomposerlegend.cpp
    M src/core/composer/qgscomposerlegend.h
    M src/core/composer/qgscomposermap.cpp
    M src/core/composer/qgscomposermap.h
    M src/core/composer/qgscomposition.cpp
    M src/core/composer/qgscomposition.h
    M src/core/gps/qextserialport/qextserialenumerator.cpp
    M src/core/gps/qgsgpsconnection.cpp
    M src/core/gps/qgsgpsconnection.h
    M src/core/gps/qgsgpsconnectionregistry.cpp
    M src/core/gps/qgsgpsconnectionregistry.h
    M src/core/gps/qgsgpsdconnection.cpp
    M src/core/gps/qgsgpsdetector.cpp
    R src/core/gps/qgsgpstrackerthread.cpp
    R src/core/gps/qgsgpstrackerthread.h
    A src/core/gps/qgsqtlocationconnection.cpp
    A src/core/gps/qgsqtlocationconnection.h
    M src/core/pal/hashtable.hpp
    M src/core/qgis.h
    M src/core/qgsapplication.cpp
    M src/core/qgsapplication.h
    M src/core/qgsattributeaction.cpp
    M src/core/qgsattributeaction.h
    M src/core/qgsbrowsermodel.cpp
    M src/core/qgscoordinatereferencesystem.cpp
    M src/core/qgscoordinatereferencesystem.h
    M src/core/qgscoordinatetransform.cpp
    M src/core/qgsdataitem.cpp
    M src/core/qgsdataitem.h
    M src/core/qgsdataprovider.h
    M src/core/qgsdatasourceuri.cpp
    M src/core/qgsdatasourceuri.h
    R src/core/qgsdbtablemodel.cpp
    R src/core/qgsdbtablemodel.h
    M src/core/qgsdiagram.h
    M src/core/qgsdistancearea.cpp
    M src/core/qgsexpression.cpp
    M src/core/qgsexpression.h
    M src/core/qgsexpressionlexer.ll
    M src/core/qgsexpressionparser.yy
    M src/core/qgsgeometry.cpp
    M src/core/qgsgeometry.h
    A src/core/qgsgeometryvalidator.cpp
    A src/core/qgsgeometryvalidator.h
    M src/core/qgslabel.cpp
    M src/core/qgslogger.cpp
    M src/core/qgslogger.h
    M src/core/qgsmaplayer.cpp
    M src/core/qgsmaplayer.h
    M src/core/qgsmaplayerregistry.cpp
    M src/core/qgsmaplayerregistry.h
    M src/core/qgsmaprenderer.cpp
    M src/core/qgsmaprenderer.h
    M src/core/qgsmaptopixel.h
    M src/core/qgsmessagelog.cpp
    M src/core/qgsmessagelog.h
    M src/core/qgspallabeling.cpp
    M src/core/qgspallabeling.h
    M src/core/qgspluginlayerregistry.cpp
    M src/core/qgspoint.cpp
    M src/core/qgsproject.cpp
    M src/core/qgsrasterdataprovider.cpp
    M src/core/qgsrectangle.cpp
    M src/core/qgsrectangle.h
    M src/core/qgssearchstringparser.yy
    M src/core/qgsvectordataprovider.cpp
    M src/core/qgsvectorfilewriter.cpp
    M src/core/qgsvectorlayer.cpp
    M src/core/qgsvectorlayer.h
    M src/core/qgsvectorlayerimport.cpp
    M src/core/qgsvectorlayerimport.h
    M src/core/raster/qgscolorrampshader.cpp
    M src/core/raster/qgscolorrampshader.h
    M src/core/raster/qgscubicrasterresampler.cpp
    M src/core/raster/qgsrasterlayer.cpp
    M src/core/raster/qgsrasterlayer.h
    M src/core/renderer/qgsgraduatedsymbolrenderer.cpp
    M src/core/spatialite/spatialite.c
    M src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp
    M src/core/symbology-ng/qgscategorizedsymbolrendererv2.h
    M src/core/symbology-ng/qgsellipsesymbollayerv2.cpp
    M src/core/symbology-ng/qgsellipsesymbollayerv2.h
    M src/core/symbology-ng/qgsfillsymbollayerv2.cpp
    M src/core/symbology-ng/qgsfillsymbollayerv2.h
    M src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
    M src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h
    M src/core/symbology-ng/qgslinesymbollayerv2.cpp
    M src/core/symbology-ng/qgslinesymbollayerv2.h
    M src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
    M src/core/symbology-ng/qgsmarkersymbollayerv2.h
    M src/core/symbology-ng/qgspointdisplacementrenderer.cpp
    M src/core/symbology-ng/qgspointdisplacementrenderer.h
    M src/core/symbology-ng/qgsrendererv2.cpp
    M src/core/symbology-ng/qgsrendererv2.h
    M src/core/symbology-ng/qgsrendererv2registry.cpp
    M src/core/symbology-ng/qgsrendererv2registry.h
    M src/core/symbology-ng/qgsrulebasedrendererv2.cpp
    M src/core/symbology-ng/qgsrulebasedrendererv2.h
    M src/core/symbology-ng/qgssinglesymbolrendererv2.cpp
    M src/core/symbology-ng/qgssinglesymbolrendererv2.h
    M src/core/symbology-ng/qgssvgcache.cpp
    M src/core/symbology-ng/qgssymbollayerv2.cpp
    M src/core/symbology-ng/qgssymbollayerv2.h
    M src/core/symbology-ng/qgssymbollayerv2registry.cpp
    M src/core/symbology-ng/qgssymbollayerv2registry.h
    M src/core/symbology-ng/qgssymbollayerv2utils.cpp
    M src/core/symbology-ng/qgssymbollayerv2utils.h
    M src/core/symbology-ng/qgssymbolv2.cpp
    M src/core/symbology-ng/qgssymbolv2.h
    M src/core/symbology-ng/qgsvectorfieldsymbollayer.cpp
    M src/core/symbology-ng/qgsvectorfieldsymbollayer.h
    M src/gui/CMakeLists.txt
    M src/gui/attributetable/qgsattributetablefiltermodel.h
    M src/gui/attributetable/qgsattributetablememorymodel.cpp
    M src/gui/attributetable/qgsattributetablememorymodel.h
    M src/gui/attributetable/qgsattributetablemodel.cpp
    M src/gui/attributetable/qgsattributetablemodel.h
    M src/gui/attributetable/qgsattributetableview.cpp
    M src/gui/attributetable/qgsattributetableview.h
    M src/gui/qgisgui.cpp
    M src/gui/qgisinterface.h
    M src/gui/qgsattributeeditor.cpp
    M src/gui/qgscomposerview.cpp
    M src/gui/qgscomposerview.h
    M src/gui/qgsdetaileditemdata.cpp
    M src/gui/qgsdetaileditemdata.h
    M src/gui/qgsdetaileditemdelegate.cpp
    M src/gui/qgsdetaileditemdelegate.h
    M src/gui/qgsdetaileditemwidget.cpp
    M src/gui/qgsencodingfiledialog.cpp
    M src/gui/qgsexpressionbuilderdialog.cpp
    M src/gui/qgsexpressionbuilderdialog.h
    M src/gui/qgsexpressionbuilderwidget.cpp
    M src/gui/qgsexpressionbuilderwidget.h
    A src/gui/qgsexpressionhighlighter.cpp
    A src/gui/qgsexpressionhighlighter.h
    M src/gui/qgsfieldvalidator.cpp
    M src/gui/qgsgenericprojectionselector.cpp
    M src/gui/qgslegendinterface.h
    M src/gui/qgsmanageconnectionsdialog.cpp
    M src/gui/qgsmanageconnectionsdialog.h
    M src/gui/qgsmapcanvas.cpp
    M src/gui/qgsmapcanvas.h
    M src/gui/qgsmapcanvassnapper.h
    M src/gui/qgsmaptool.cpp
    M src/gui/qgsmaptool.h
    A src/gui/qgsmaptooltouch.cpp
    A src/gui/qgsmaptooltouch.h
    M src/gui/qgsmessagelogviewer.cpp
    M src/gui/qgsmessagelogviewer.h
    M src/gui/qgsnewhttpconnection.cpp
    M src/gui/qgsnewhttpconnection.h
    M src/gui/qgsnewvectorlayerdialog.cpp
    M src/gui/qgsprojectionselector.cpp
    M src/gui/qgsprojectionselector.h
    M src/gui/qgsquerybuilder.cpp
    A src/gui/qgsscalecombobox.cpp
    A src/gui/qgsscalecombobox.h
    M src/gui/qgssearchquerybuilder.cpp
    M src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp
    M src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.h
    M src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
    M src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.h
    M src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp
    M src/gui/symbology-ng/qgsrendererv2propertiesdialog.h
    M src/gui/symbology-ng/qgsrendererv2widget.cpp
    M src/gui/symbology-ng/qgsrendererv2widget.h
    M src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp
    M src/gui/symbology-ng/qgsrulebasedrendererv2widget.h
    M src/gui/symbology-ng/qgssinglesymbolrendererv2widget.cpp
    M src/gui/symbology-ng/qgssinglesymbolrendererv2widget.h
    M src/gui/symbology-ng/qgsstylev2managerdialog.cpp
    M src/gui/symbology-ng/qgssymbollayerv2widget.cpp
    M src/gui/symbology-ng/qgssymbollayerv2widget.h
    M src/gui/symbology-ng/qgssymbollevelsv2dialog.cpp
    M src/gui/symbology-ng/qgssymbollevelsv2dialog.h
    M src/helpviewer/qgshelpviewer.cpp
    M src/helpviewer/qgshelpviewerbase.ui
    M src/mapserver/CMakeLists.txt
    M src/mapserver/qgis_map_serv.cpp
    M src/mapserver/qgsconfigparser.cpp
    M src/mapserver/qgsconfigparser.h
    M src/mapserver/qgshttprequesthandler.cpp
    M src/mapserver/qgshttprequesthandler.h
    M src/mapserver/qgsprojectparser.cpp
    M src/mapserver/qgsprojectparser.h
    M src/mapserver/qgsrequesthandler.h
    M src/mapserver/qgssldparser.cpp
    M src/mapserver/qgssldparser.h
    R src/mapserver/qgssldrenderer.cpp
    R src/mapserver/qgssldrenderer.h
    R src/mapserver/qgssldrule.cpp
    R src/mapserver/qgssldrule.h
    A src/mapserver/qgswfsserver.cpp
    A src/mapserver/qgswfsserver.h
    M src/mapserver/qgswmsserver.cpp
    M src/mapserver/qgswmsserver.h
    M src/plugins/CMakeLists.txt
    A src/plugins/compass/CMakeLists.txt
    A src/plugins/compass/compass.cpp
    A src/plugins/compass/compass.h
    A src/plugins/compass/compass.qrc
    A src/plugins/compass/icons/mCompassRun.png
    A src/plugins/compass/qgscompassplugin.cpp
    A src/plugins/compass/qgscompassplugin.h
    A src/plugins/compass/qgscompassplugingui.cpp
    A src/plugins/compass/qgscompassplugingui.h
    A src/plugins/compass/qgscompasspluginguibase.ui
    M src/plugins/coordinate_capture/coordinatecapture.cpp
    M src/plugins/delimited_text/qgsdelimitedtextplugin.cpp
    M src/plugins/delimited_text/qgsdelimitedtextplugin.h
    M src/plugins/delimited_text/qgsdelimitedtextplugingui.cpp
    M src/plugins/diagram_overlay/qgsdiagramoverlayplugin.cpp
    M src/plugins/dxf2shp_converter/CMakeLists.txt
    M src/plugins/dxf2shp_converter/dxf2shpconverter.cpp
    M src/plugins/dxf2shp_converter/dxf2shpconvertergui.cpp
    M src/plugins/dxf2shp_converter/dxf2shpconvertergui.h
    M src/plugins/dxf2shp_converter/dxf2shpconvertergui.ui
    M src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.cpp
    M src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.cpp
    M src/plugins/evis/evis.cpp
    M src/plugins/georeferencer/CMakeLists.txt
    M src/plugins/georeferencer/qgsgeorefplugin.cpp
    M src/plugins/georeferencer/qgsgeorefplugingui.cpp
    M src/plugins/georeferencer/qgsleastsquares.cpp
    M src/plugins/globe/globe_plugin.cpp
    M src/plugins/globe/globe_plugin.h
    M src/plugins/globe/globe_plugin_dialog.cpp
    M src/plugins/globe/qgsosgearthtilesource.cpp
    M src/plugins/globe/qgsosgearthtilesource.h
    M src/plugins/gps_importer/CMakeLists.txt
    M src/plugins/gps_importer/qgsgpsdevicedialog.cpp
    M src/plugins/gps_importer/qgsgpsplugin.cpp
    M src/plugins/gps_importer/qgsgpsplugingui.cpp
    M src/plugins/gps_importer/qgsgpsplugingui.h
    M src/plugins/gps_importer/qgsgpspluginguibase.ui
    M src/plugins/grass/CMakeLists.txt
    M src/plugins/grass/modules/default.qgc
    A src/plugins/grass/modules/r.aspect.1.png
    A src/plugins/grass/modules/r.aspect.2.png
    A src/plugins/grass/modules/r.aspect.qgm
    M src/plugins/grass/modules/r.external.all.qgm
    M src/plugins/grass/modules/r.external.qgis.qgm
    M src/plugins/grass/modules/r.external.qgm
    M src/plugins/grass/modules/r.in.gdal.loc.qgm
    M src/plugins/grass/modules/r.in.gdal.qgis.loc.qgm
    M src/plugins/grass/modules/r.in.gdal.qgis.qgm
    M src/plugins/grass/modules/r.in.gdal.qgm
    M src/plugins/grass/modules/r.mask.qgm
    A src/plugins/grass/modules/r.slope.1.png
    A src/plugins/grass/modules/r.slope.2.png
    A src/plugins/grass/modules/r.slope.qgm
    A src/plugins/grass/modules/r.stats.1.png
    A src/plugins/grass/modules/r.stats.qgm
    M src/plugins/grass/modules/r.sunmask.date.time.qgm
    M src/plugins/grass/modules/r.sunmask.position.qgm
    M src/plugins/grass/modules/v.drape.qgm
    A src/plugins/grass/modules/v.extrude.attr.qgm
    A src/plugins/grass/modules/v.extrude.fixed.qgm
    M src/plugins/grass/modules/v.in.ogr.all.loc.qgm
    M src/plugins/grass/modules/v.in.ogr.all.qgm
    M src/plugins/grass/modules/v.in.ogr.loc.qgm
    M src/plugins/grass/modules/v.in.ogr.qgis.loc.qgm
    M src/plugins/grass/modules/v.in.ogr.qgis.qgm
    M src/plugins/grass/modules/v.in.ogr.qgm
    M src/plugins/grass/modules/v.in.region.qgm
    M src/plugins/grass/modules/v.random.qgm
    M src/plugins/grass/modules/v.surf.bspline.qgm
    M src/plugins/grass/modules/v.surf.idw.qgm
    M src/plugins/grass/modules/v.surf.rst.qgm
    M src/plugins/grass/qgsgrassbrowser.cpp
    M src/plugins/grass/qgsgrassedit.cpp
    M src/plugins/grass/qgsgrassmapcalc.cpp
    M src/plugins/grass/qgsgrassmapcalc.h
    M src/plugins/grass/qgsgrassmodule.cpp
    M src/plugins/grass/qgsgrassmodule.h
    M src/plugins/grass/qgsgrassnewmapset.cpp
    M src/plugins/grass/qgsgrassplugin.cpp
    M src/plugins/grass/qgsgrassplugin.h
    M src/plugins/grass/qgsgrassregion.cpp
    M src/plugins/grass/qgsgrassselect.cpp
    M src/plugins/grass/qgsgrassselect.h
    M src/plugins/grass/qgsgrassutils.cpp
    M src/plugins/grass/qgsgrassutils.h
    M src/plugins/grass/qtermwidget/Screen.cpp
    M src/plugins/grass/qtermwidget/ShellCommand.cpp
    A src/plugins/heatmap/CMakeLists.txt
    A src/plugins/heatmap/heatmap.cpp
    A src/plugins/heatmap/heatmap.h
    A src/plugins/heatmap/heatmap.png
    A src/plugins/heatmap/heatmap.qrc
    A src/plugins/heatmap/heatmap.svg
    A src/plugins/heatmap/heatmapgui.cpp
    A src/plugins/heatmap/heatmapgui.h
    A src/plugins/heatmap/heatmapguibase.ui
    M src/plugins/interpolation/qgsinterpolationdialog.cpp
    M src/plugins/interpolation/qgsinterpolationdialog.h
    R src/plugins/interpolation/qgsinterpolationdialogbase.h
    M src/plugins/interpolation/qgsinterpolationplugin.cpp
    M src/plugins/offline_editing/CMakeLists.txt
    M src/plugins/offline_editing/offline_editing.cpp
    M src/plugins/offline_editing/offline_editing_plugin.cpp
    M src/plugins/offline_editing/offline_editing_plugin_gui.cpp
    M src/plugins/offline_editing/offline_editing_plugin_gui.h
    M src/plugins/oracle_raster/qgsoracle_plugin.cpp
    M src/plugins/oracle_raster/qgsselectgeoraster_ui.cpp
    M src/plugins/plugin_builder.py
    M src/plugins/plugin_template/plugin.cpp
    M src/plugins/qgisplugin.h
    M src/plugins/qgsrendererplugin.h
    M src/plugins/qgsvectoroverlayplugin.h
    M src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisdialog.cpp
    M src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisdialog.h
    M src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisdialogbase.ui
    M src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisplugin.cpp
    M src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisplugin.h
    M src/plugins/roadgraph/exportdlg.cpp
    M src/plugins/roadgraph/linevectorlayerwidget.cpp
    M src/plugins/roadgraph/roadgraphplugin.cpp
    M src/plugins/roadgraph/shortestpathwidget.cpp
    M src/plugins/roadgraph/shortestpathwidget.h
    M src/plugins/spatialquery/qgsspatialquerydialog.cpp
    M src/plugins/spatialquery/qgsspatialqueryplugin.cpp
    M src/plugins/spit/CMakeLists.txt
    M src/plugins/spit/qgsshapefile.cpp
    M src/plugins/spit/qgsspit.cpp
    M src/plugins/spit/qgsspit.h
    M src/plugins/spit/qgsspitplugin.cpp
    M src/plugins/spit/qgsspitplugin.h
    M src/plugins/sqlanywhere/sqlanywhere.cpp
    M src/plugins/zonal_statistics/qgszonalstatisticsdialog.cpp
    M src/plugins/zonal_statistics/qgszonalstatisticsplugin.cpp
    M src/providers/CMakeLists.txt
    M src/providers/gdal/qgsgdaldataitems.cpp
    M src/providers/gdal/qgsgdalprovider.cpp
    M src/providers/gdal/qgsgdalprovider.h
    M src/providers/grass/CMakeLists.txt
    M src/providers/grass/qgis.d.rast.c
    M src/providers/grass/qgsgrass.cpp
    M src/providers/grass/qgsgrass.h
    M src/providers/grass/qgsgrassprovider.cpp
    M src/providers/grass/qgsgrassprovider.h
    A src/providers/grass/qgsgrassprovidermodule.cpp
    A src/providers/grass/qgsgrassprovidermodule.h
    M src/providers/grass/qgsgrassrasterprovider.cpp
    M src/providers/memory/qgsmemoryprovider.cpp
    A src/providers/mssql/CMakeLists.txt
    A src/providers/mssql/qgsmssqldataitems.cpp
    A src/providers/mssql/qgsmssqldataitems.h
    A src/providers/mssql/qgsmssqlgeometryparser.cpp
    A src/providers/mssql/qgsmssqlnewconnection.cpp
    A src/providers/mssql/qgsmssqlnewconnection.h
    A src/providers/mssql/qgsmssqlprovider.cpp
    A src/providers/mssql/qgsmssqlprovider.h
    A src/providers/mssql/qgsmssqlsourceselect.cpp
    A src/providers/mssql/qgsmssqlsourceselect.h
    A src/providers/mssql/qgsmssqltablemodel.cpp
    A src/providers/mssql/qgsmssqltablemodel.h
    M src/providers/ogr/qgsogrprovider.cpp
    M src/providers/ogr/qgsogrprovider.h
    M src/providers/osm/osmhandler.cpp
    M src/providers/osm/osmhandler.h
    M src/providers/postgres/CMakeLists.txt
    R src/providers/postgres/create_test_tables
    A src/providers/postgres/qgscolumntypethread.cpp
    A src/providers/postgres/qgscolumntypethread.h
    A src/providers/postgres/qgsdbfilterproxymodel.cpp
    A src/providers/postgres/qgsdbfilterproxymodel.h
    M src/providers/postgres/qgspgnewconnection.cpp
    M src/providers/postgres/qgspgsourceselect.cpp
    M src/providers/postgres/qgspgsourceselect.h
    A src/providers/postgres/qgspgtablemodel.cpp
    A src/providers/postgres/qgspgtablemodel.h
    A src/providers/postgres/qgspostgresconn.cpp
    A src/providers/postgres/qgspostgresconn.h
    R src/providers/postgres/qgspostgresconnection.cpp
    R src/providers/postgres/qgspostgresconnection.h
    M src/providers/postgres/qgspostgresdataitems.cpp
    M src/providers/postgres/qgspostgresdataitems.h
    M src/providers/postgres/qgspostgresprovider.cpp
    M src/providers/postgres/qgspostgresprovider.h
    M src/providers/spatialite/qgsspatialitedataitems.cpp
    M src/providers/spatialite/qgsspatialiteprovider.cpp
    M src/providers/spatialite/qgsspatialiteprovider.h
    M src/providers/spatialite/qgsspatialitesourceselect.cpp
    M src/providers/spatialite/qgsspatialitesourceselect.h
    M src/providers/sqlanywhere/qgssqlanywhereprovider.cpp
    M src/providers/sqlanywhere/qgssqlanywhereprovider.h
    M src/providers/sqlanywhere/sqlanyconnection/CMakeLists.txt
    M src/providers/wfs/CMakeLists.txt
    M src/providers/wfs/qgswfsconnection.cpp
    M src/providers/wfs/qgswfsdata.cpp
    M src/providers/wfs/qgswfsdataitems.cpp
    M src/providers/wfs/qgswfsprovider.cpp
    M src/providers/wfs/qgswfsprovider.h
    M src/providers/wfs/qgswfssourceselect.cpp
    M src/providers/wfs/qgswfssourceselect.h
    A src/providers/wfs/qgswfsutils.cpp
    A src/providers/wfs/qgswfsutils.h
    M src/providers/wms/qgswmsdataitems.cpp
    M src/providers/wms/qgswmsprovider.cpp
    M src/providers/wms/qgswmsprovider.h
    M src/providers/wms/qgswmssourceselect.cpp
    M src/python/qgspythonutils.h
    M src/python/qgspythonutilsimpl.cpp
    M src/python/qgspythonutilsimpl.h
    M src/ui/qgisapp.ui
    M src/ui/qgsattributeactiondialogbase.ui
    M src/ui/qgsattributetabledialog.ui
    M src/ui/qgsattributetypeedit.ui
    M src/ui/qgsbookmarksbase.ui
    A src/ui/qgsbrowserlayerpropertiesbase.ui
    M src/ui/qgscomposerarrowwidgetbase.ui
    M src/ui/qgscomposerbase.ui
    M src/ui/qgscomposeritemwidgetbase.ui
    M src/ui/qgscomposerlabelwidgetbase.ui
    M src/ui/qgscomposerlegendwidgetbase.ui
    M src/ui/qgscomposermapwidgetbase.ui
    M src/ui/qgscomposerpicturewidgetbase.ui
    M src/ui/qgscomposerscalebarwidgetbase.ui
    M src/ui/qgscomposertablewidgetbase.ui
    M src/ui/qgscompositionwidgetbase.ui
    M src/ui/qgsdbsourceselectbase.ui
    M src/ui/qgsdetaileditemwidgetbase.ui
    M src/ui/qgsexpressionbuilder.ui
    M src/ui/qgsfieldcalculatorbase.ui
    M src/ui/qgsgpsinformationwidgetbase.ui
    M src/ui/qgslabelingguibase.ui
    A src/ui/qgsmssqlnewconnectionbase.ui
    M src/ui/qgsnewogrconnectionbase.ui
    M src/ui/qgsnewspatialitelayerdialogbase.ui
    M src/ui/qgsoptionsbase.ui
    M src/ui/qgsprojectionselectorbase.ui
    M src/ui/qgsprojectpropertiesbase.ui
    M src/ui/qgsrendererrulepropsdialogbase.ui
    M src/ui/qgsrendererv2propsdialogbase.ui
    M src/ui/qgsrulebasedrendererv2widget.ui
    M src/ui/qgssymbolv2selectordialogbase.ui
    M src/ui/qgsvectorlayerpropertiesbase.ui
    M src/ui/qgsvectorlayersaveasdialogbase.ui
    M src/ui/qgswfssourceselectbase.ui
    M src/ui/qgswmssourceselectbase.ui
    M src/ui/symbollayer/widget_fontmarker.ui
    M src/ui/symbollayer/widget_linedecoration.ui
    M src/ui/symbollayer/widget_linepatternfill.ui
    M src/ui/symbollayer/widget_markerline.ui
    M src/ui/symbollayer/widget_pointpatternfill.ui
    M src/ui/symbollayer/widget_simplefill.ui
    M src/ui/symbollayer/widget_simpleline.ui
    M src/ui/symbollayer/widget_simplemarker.ui
    M src/ui/symbollayer/widget_svgfill.ui
    M src/ui/symbollayer/widget_svgmarker.ui
    A tests/qt_modeltest/dynamictreemodel.cpp
    A tests/qt_modeltest/dynamictreemodel.h
    A tests/qt_modeltest/modeltest.cpp
    A tests/qt_modeltest/modeltest.h
    A tests/qt_modeltest/readme.txt
    A tests/qt_modeltest/tst_modeltest.cpp
    M tests/src/core/CMakeLists.txt
    M tests/src/core/qgsrenderchecker.cpp
    M tests/src/core/qgsrenderchecker.h
    M tests/src/core/regression1141.cpp
    M tests/src/core/regression992.cpp
    M tests/src/core/testqgscoordinatereferencesystem.cpp
    M tests/src/core/testqgsexpression.cpp
    M tests/src/core/testqgsmaprenderer.cpp
    M tests/src/core/testqgsrasterlayer.cpp
    M tests/src/core/testqgsrenderers.cpp
    A tests/src/core/testqgsrulebasedrenderer.cpp
    M tests/src/core/testqgsvectorfilewriter.cpp
    M tests/src/core/testqgsvectorlayer.cpp
    M tests/src/gui/CMakeLists.txt
    A tests/src/gui/testrendererv2gui.cpp
    A tests/src/gui/testrendererv2gui.h
    A tests/testdata/create_test_tables
    M tests/testdata/expected_continuous.png
    M tests/testdata/expected_graduated.png
    M tests/testdata/expected_landsat_875.png
    M tests/testdata/expected_landsat_basic.png
    M tests/testdata/expected_maprender.png
    M tests/testdata/expected_raster.png
    M tests/testdata/expected_raster_pseudo.png
    M tests/testdata/expected_single.png
    M tests/testdata/expected_uniquevalue.png
    A tests/testdata/landsat.tif.aux.xml
    M tests/testdata/lines.qml
    M tests/testdata/maprender_testdata.qml
    M tests/testdata/points.qml
    M tests/testdata/polys.qml
    A tests/testdata/rulebasedrenderer_invalid.xml
    A tests/testdata/rulebasedrenderer_simple.xml
    A tests/testdata/tenbytenraster.asc.aux.xml

  Log Message:
  -----------
  Merged from master into raster resampler branch


Compare: https://github.com/qgis/Quantum-GIS/compare/4da0c03...1f90bc6


More information about the QGIS-commit mailing list