Showing with 5,778 additions and 12,725 deletions.
  1. +0 −14 CMakeLists.txt
  2. +0 −31 PROVENANCE
  3. +0 −2 cmake_templates/qgsconfig.h.in
  4. +1,894 −1,768 i18n/qgis_fr.ts
  5. +536 −525 i18n/qgis_pl_PL.ts
  6. +3,152 −2,947 i18n/qgis_sl_SI.ts
  7. +1 −9 src/app/qgsoptions.cpp
  8. +0 −29 src/core/CMakeLists.txt
  9. +71 −34 src/core/qgsdataitem.cpp
  10. +8 −7 src/core/qgsmaplayer.cpp
  11. +0 −458 src/core/quazip/COPYING
  12. +0 −535 src/core/quazip/JlCompress.cpp
  13. +0 −115 src/core/quazip/JlCompress.h
  14. +0 −66 src/core/quazip/README.txt
  15. +0 −136 src/core/quazip/crypt.h
  16. +0 −77 src/core/quazip/ioapi.h
  17. +0 −150 src/core/quazip/qioapi.cpp
  18. +0 −28 src/core/quazip/quaadler32.cpp
  19. +0 −29 src/core/quazip/quaadler32.h
  20. +0 −54 src/core/quazip/quachecksum32.h
  21. +0 −28 src/core/quazip/quacrc32.cpp
  22. +0 −27 src/core/quazip/quacrc32.h
  23. +0 −588 src/core/quazip/quazip.cpp
  24. +0 −410 src/core/quazip/quazip.h
  25. +0 −55 src/core/quazip/quazip_global.h
  26. +0 −517 src/core/quazip/quazipfile.cpp
  27. +0 −443 src/core/quazip/quazipfile.h
  28. +0 −67 src/core/quazip/quazipfileinfo.h
  29. +0 −51 src/core/quazip/quazipnewinfo.cpp
  30. +0 −103 src/core/quazip/quazipnewinfo.h
  31. +0 −1,513 src/core/quazip/unzip.c
  32. +0 −357 src/core/quazip/unzip.h
  33. +0 −1,208 src/core/quazip/zip.c
  34. +0 −246 src/core/quazip/zip.h
  35. +2 −1 src/gui/qgsmessagelogviewer.cpp
  36. +0 −1 src/plugins/georeferencer/qgsgeorefplugin.cpp
  37. +24 −19 src/plugins/georeferencer/qgsgeorefplugingui.cpp
  38. +8 −8 src/plugins/georeferencer/qgsgeorefplugingui.h
  39. +1 −1 src/providers/gdal/qgsgdaldataitems.cpp
  40. +2 −3 src/providers/gdal/qgsgdalprovider.cpp
  41. +1 −1 src/providers/ogr/qgsogrdataitems.cpp
  42. +2 −3 src/providers/ogr/qgsogrprovider.cpp
  43. +35 −28 src/providers/wms/qgswmsprovider.cpp
  44. +3 −3 src/providers/wms/qgswmssourceselect.cpp
  45. +0 −1 tests/src/core/regression1141.cpp
  46. +0 −1 tests/src/core/regression992.cpp
  47. +0 −1 tests/src/core/testqgsmaprenderer.cpp
  48. +0 −1 tests/src/core/testqgsrasterlayer.cpp
  49. +38 −26 tests/src/core/testziplayer.cpp
14 changes: 0 additions & 14 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,20 +258,6 @@ FIND_PROGRAM(QT_LRELEASE_EXECUTABLE
NO_DEFAULT_PATH
)


#############################################################
# search for zlib optional, used by quazip
# this uses script provided by cmake
# if WIN32 should use zlib from QT
FIND_PACKAGE(ZLIB)
IF (ZLIB_FOUND)
MESSAGE(STATUS "Found zlib: ${ZLIB_LIBRARY}")
SET(HAVE_ZLIB TRUE)
ELSE (ZLIB_FOUND)
MESSAGE(STATUS "Could not find zlib (optional)")
ENDIF(ZLIB_FOUND)


#############################################################
# enable warnings

Expand Down
31 changes: 0 additions & 31 deletions PROVENANCE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,35 +68,4 @@ licensed under the GPL or LGPL, version 2.
== External Source Files ==
The following files are included in the QGIS source tree from external
sources. The source, license, and copyright are noted for each.
=== src/core/quazip ===
QuaZIP is the C++ wrapper for the Gilles Vollant's ZIP/UNZIP package
using Trolltech's Qt library.
Copyright (C) 2005-2011 Sergey A. Tachenov
Added to the QGIS source tree 17 April 2012 as part of a patch from
Etienne Tourigny <etourigny.dev@gmail.com>

* COPYING
* ioapi.h
* JlCompress.h
* quaadler32.cpp
* quachecksum32.h
* quacrc32.h
* quazipfile.cpp
* quazipfileinfo.h
* quazip.h
* quazipnewinfo.h
* unzip.c
* zip.c
* crypt.h
* JlCompress.cpp
* qioapi.cpp
* quaadler32.h
* quacrc32.cpp
* quazip.cpp
* quazipfile.h
* quazip_global.h
* quazipnewinfo.cpp
* README.txt
* unzip.h
* zip.h

2 changes: 0 additions & 2 deletions cmake_templates/qgsconfig.h.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@

#cmakedefine HAVE_SPATIALITE

#cmakedefine HAVE_ZLIB

#cmakedefine HAVE_MSSQL

#cmakedefine HAVE_PYTHON
Expand Down
Loading