Skip to content
Permalink
Browse files

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

  • Loading branch information
volaya committed Oct 27, 2012
2 parents 5c762ef + 779e166 commit 34f677a576811972ec4b1518fe688d96b3b87a6a
Showing with 6,195 additions and 4,975 deletions.
  1. +10 −5 CMakeLists.txt
  2. +5,015 −4,720 i18n/qgis_sv.ts
  3. +6 −0 postinstall/CMakeLists.txt
  4. +9 −0 postinstall/PostInstall.cmake.in
  5. +10 −0 python/CMakeLists.txt
  6. +10 −0 python/plugins/CMakeLists.txt
  7. +0 −2 python/plugins/sextante/about/CMakeLists.txt
  8. +2 −1 python/plugins/sextante/ftools/CMakeLists.txt
  9. +2 −1 python/plugins/sextante/gdal/CMakeLists.txt
  10. +3 −1 python/plugins/sextante/help/CMakeLists.txt
  11. +2 −1 python/plugins/sextante/mmqgisx/CMakeLists.txt
  12. +6 −1 python/plugins/sextante/pymorph/html/morph/CMakeLists.txt
  13. +18 −0 src/app/legend/qgslegend.cpp
  14. +3 −1 src/app/legend/qgslegend.h
  15. +7 −0 src/app/legend/qgslegenditem.h
  16. +11 −5 src/app/legend/qgslegendlayer.cpp
  17. +2 −2 src/app/qgisapp.cpp
  18. +28 −2 src/app/qgsmaptoolidentify.cpp
  19. +74 −59 src/app/qgsprojectproperties.cpp
  20. +11 −0 src/app/qgsrasterlayerproperties.cpp
  21. +3 −0 src/app/qgsrasterlayerproperties.h
  22. +10 −2 src/app/qgsvectorlayerproperties.cpp
  23. +5 −0 src/app/qgsvectorlayerproperties.h
  24. +16 −6 src/core/qgsgeometry.cpp
  25. +4 −4 src/core/qgsmaplayer.h
  26. +2 −1 src/core/qgsmaprenderer.h
  27. +1 −1 src/core/qgsscalecalculator.cpp
  28. +2 −2 src/core/qgsscalecalculator.h
  29. +8 −4 src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp
  30. +1 −1 src/core/symbology-ng/qgscategorizedsymbolrendererv2.h
  31. +1 −1 src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h
  32. +7 −2 src/core/symbology-ng/qgsrendererv2.h
  33. +2 −0 src/core/symbology-ng/qgsrulebasedrendererv2.cpp
  34. +1 −1 src/core/symbology-ng/qgsrulebasedrendererv2.h
  35. +81 −11 src/gui/attributetable/qgsattributetablemodel.cpp
  36. +2 −0 src/gui/attributetable/qgsattributetablemodel.h
  37. +1 −0 src/mapserver/CMakeLists.txt
  38. +0 −8 src/mapserver/qgis_map_serv.cpp
  39. +116 −8 src/mapserver/qgsfilter.cpp
  40. +0 −67 src/mapserver/qgshttprequesthandler.cpp
  41. +1 −1 src/mapserver/qgspostrequesthandler.cpp
  42. +40 −0 src/mapserver/qgsprojectparser.cpp
  43. +77 −0 src/mapserver/qgsspatialfilter.cpp
  44. +73 −0 src/mapserver/qgsspatialfilter.h
  45. +194 −14 src/mapserver/qgswfsserver.cpp
  46. +127 −0 src/mapserver/qgswmsserver.cpp
  47. +3 −0 src/mapserver/qgswmsserver.h
  48. +1 −0 src/plugins/globe/CMakeLists.txt
  49. +42 −12 src/ui/qgsprojectpropertiesbase.ui
  50. +67 −15 src/ui/qgsrasterlayerpropertiesbase.ui
  51. +78 −13 src/ui/qgsvectorlayerpropertiesbase.ui
@@ -76,6 +76,7 @@ IF (WITH_BINDINGS)
# as otherwise user has to use PYTHONPATH environemnt variable to add
# QGIS bindings to package search path
SET (BINDINGS_GLOBAL_INSTALL FALSE CACHE BOOL "Install bindings to global python directory? (might need root)")
SET (WITH_PY_COMPILE FALSE CACHE BOOL "Determines whether Python modules in staged or installed locations are byte-compiled")
# concatenate QScintilla2 API files
SET (WITH_QSCIAPI TRUE CACHE BOOL "Determines whether the QScintilla2 API files will be updated and concatenated")
ENDIF (WITH_BINDINGS)
@@ -626,11 +627,11 @@ IF (APPLE)

# make hard link to embedded app bundle binary (symlink won't work)
# allows QGIS to be run directly from build directory
IF (EXISTS "${CMAKE_BINARY_DIR}/output/bin/QGIS.app/Contents/MacOS/QGIS")
EXECUTE_PROCESS(COMMAND /bin/ln -f
"${CMAKE_BINARY_DIR}/output/bin/QGIS.app/Contents/MacOS/QGIS"
"${CMAKE_BINARY_DIR}/output/bin/QGIS")
ENDIF ()
ADD_CUSTOM_TARGET(mac_hardlink ALL
COMMAND /bin/ln -f QGIS.app/Contents/MacOS/QGIS QGIS
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/output/bin"
DEPENDS QGIS
)
ENDIF (APPLE)

# manual page - makes sense only on unix systems
@@ -640,6 +641,10 @@ ENDIF (UNIX AND NOT APPLE)

INSTALL(FILES cmake/FindQGIS.cmake DESTINATION ${QGIS_DATA_DIR})

#############################################################
# Post-install commands
ADD_SUBDIRECTORY(postinstall)

#############################################################
# Uninstall stuff see: http://www.vtk.org/Wiki/CMake_FAQ
CONFIGURE_FILE(

0 comments on commit 34f677a

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