Skip to content
Permalink
Browse files
Revert "Merge branch 'master' of github.com:qgis/Quantum-GIS into qgi…
…s-master"

This reverts commit 78ce3cd, reversing
changes made to 2414a3a.
  • Loading branch information
timlinux committed Nov 30, 2011
1 parent 78ce3cd commit 5193f60d2adfc8401b0eb6f93218b2ebe9c2255c
Showing with 315 additions and 18,044 deletions.
  1. +1 −7 CMakeLists.txt
  2. +0 −1 cmake_templates/qgsconfig.h.in
  3. +9 −2 {resources/css → doc}/qgisdoc.css
  4. +0 −3 resources/CMakeLists.txt
  5. +0 −4 resources/css/CMakeLists.txt
  6. +0 −36 resources/css/ie.css
  7. +0 −29 resources/css/print.css
  8. +0 −265 resources/css/screen.css
  9. +0 −4 resources/html/CMakeLists.txt
  10. +0 −41 resources/html/chart.html
  11. +0 −54 resources/html/qgsrasterlayer.html
  12. +0 −1,201 resources/js/API.txt
  13. +0 −4 resources/js/CMakeLists.txt
  14. +0 −76 resources/js/FAQ.txt
  15. +0 −22 resources/js/LICENSE.txt
  16. +0 −508 resources/js/NEWS.txt
  17. +0 −137 resources/js/PLUGINS.txt
  18. +0 −90 resources/js/README.txt
  19. +0 −1,427 resources/js/excanvas.js
  20. +0 −1 resources/js/excanvas.min.js
  21. +0 −179 resources/js/jquery.colorhelpers.js
  22. +0 −1 resources/js/jquery.colorhelpers.min.js
  23. +0 −167 resources/js/jquery.flot.crosshair.js
  24. +0 −1 resources/js/jquery.flot.crosshair.min.js
  25. +0 −183 resources/js/jquery.flot.fillbetween.js
  26. +0 −1 resources/js/jquery.flot.fillbetween.min.js
  27. +0 −140 resources/js/jquery.flot.grow.js
  28. +0 −238 resources/js/jquery.flot.image.js
  29. +0 −1 resources/js/jquery.flot.image.min.js
  30. +0 −2,599 resources/js/jquery.flot.js
  31. +0 −6 resources/js/jquery.flot.min.js
  32. +0 −336 resources/js/jquery.flot.navigate.js
  33. +0 −1 resources/js/jquery.flot.navigate.min.js
  34. +0 −750 resources/js/jquery.flot.pie.js
  35. +0 −1 resources/js/jquery.flot.pie.min.js
  36. +0 −60 resources/js/jquery.flot.resize.js
  37. +0 −1 resources/js/jquery.flot.resize.min.js
  38. +0 −344 resources/js/jquery.flot.selection.js
  39. +0 −1 resources/js/jquery.flot.selection.min.js
  40. +0 −184 resources/js/jquery.flot.stack.js
  41. +0 −1 resources/js/jquery.flot.stack.min.js
  42. +0 −70 resources/js/jquery.flot.symbol.js
  43. +0 −1 resources/js/jquery.flot.symbol.min.js
  44. +0 −103 resources/js/jquery.flot.threshold.js
  45. +0 −1 resources/js/jquery.flot.threshold.min.js
  46. +0 −8,316 resources/js/jquery.js
  47. +0 −23 resources/js/jquery.min.js
  48. +0 −96 resources/js/json.js
  49. +0 −1 src/app/CMakeLists.txt
  50. +0 −7 src/app/main.cpp
  51. +116 −60 src/app/qgsrasterlayerproperties.cpp
  52. +0 −6 src/app/qgsrasterlayerproperties.h
  53. +10 −24 src/core/qgsapplication.cpp
  54. +0 −11 src/core/qgsapplication.h
  55. +0 −1 src/core/qgsmaplayer.h
  56. +4 −4 src/core/qgsproviderregistry.cpp
  57. +2 −2 src/core/qgsproviderregistry.h
  58. +3 −3 src/core/qgsrasterdataprovider.cpp
  59. +79 −80 src/core/raster/qgsrasterlayer.cpp
  60. +3 −3 src/mapserver/qgis_map_serv.cpp
  61. +2 −2 src/providers/CMakeLists.txt
  62. +2 −2 src/providers/delimitedtext/CMakeLists.txt
  63. +2 −2 src/providers/gdal/CMakeLists.txt
  64. +21 −42 src/providers/gdal/qgsgdalprovider.cpp
  65. +2 −2 src/providers/gpx/CMakeLists.txt
  66. +4 −4 src/providers/grass/CMakeLists.txt
  67. +2 −2 src/providers/memory/CMakeLists.txt
  68. +2 −2 src/providers/ogr/CMakeLists.txt
  69. +2 −2 src/providers/osm/CMakeLists.txt
  70. +2 −2 src/providers/postgres/CMakeLists.txt
  71. +2 −2 src/providers/spatialite/CMakeLists.txt
  72. +2 −2 src/providers/sqlanywhere/CMakeLists.txt
  73. +3 −3 src/providers/sqlanywhere/sqlanyconnection/CMakeLists.txt
  74. +2 −2 src/providers/wfs/CMakeLists.txt
  75. +2 −2 src/providers/wms/CMakeLists.txt
  76. +35 −51 src/ui/qgsrasterlayerpropertiesbase.ui
  77. +1 −1 tests/bench/main.cpp
@@ -253,7 +253,6 @@ IF (WIN32)
SET (DEFAULT_LIBEXEC_SUBDIR .)
SET (DEFAULT_DATA_SUBDIR .)
SET (DEFAULT_PLUGIN_SUBDIR plugins)
SET (DEFAULT_PROVIDER_SUBDIR providers)
SET (DEFAULT_INCLUDE_SUBDIR include)

IF (MSVC)
@@ -323,8 +322,6 @@ ELSE (WIN32)
SET (QGIS_LIBEXEC_SUBDIR_REV ../..)
SET (DEFAULT_PLUGIN_SUBDIR ../PlugIns/qgis)
SET (QGIS_PLUGIN_SUBDIR_REV ../../MacOS)
SET (DEFAULT_PROVIDER_SUBDIR ../Providers/qgis)
SET (QGIS_PROVIDER_SUBDIR_REV ../../MacOS)
SET (DEFAULT_INCLUDE_SUBDIR include/qgis)
# path for framework references
SET (CMAKE_INSTALL_NAME_DIR @executable_path/${QGIS_FW_SUBDIR})
@@ -337,7 +334,6 @@ ELSE (WIN32)
SET (DEFAULT_DATA_SUBDIR share/qgis)
SET (DEFAULT_LIBEXEC_SUBDIR lib${LIB_SUFFIX}/qgis)
SET (DEFAULT_PLUGIN_SUBDIR lib${LIB_SUFFIX}/qgis/plugins)
SET (DEFAULT_PROVIDER_SUBDIR lib${LIB_SUFFIX}/qgis/providers)
SET (DEFAULT_INCLUDE_SUBDIR include/qgis)
ENDIF (APPLE)

@@ -377,12 +373,11 @@ SET (QGIS_LIB_SUBDIR ${DEFAULT_LIB_SUBDIR} CACHE STRING "Subdirectory wh
SET (QGIS_LIBEXEC_SUBDIR ${DEFAULT_LIBEXEC_SUBDIR} CACHE STRING "Subdirectory where private executables will be installed")
SET (QGIS_DATA_SUBDIR ${DEFAULT_DATA_SUBDIR} CACHE STRING "Subdirectory where QGIS data will be installed")
SET (QGIS_PLUGIN_SUBDIR ${DEFAULT_PLUGIN_SUBDIR} CACHE STRING "Subdirectory where plugins will be installed")
SET (QGIS_PROVIDER_SUBDIR ${DEFAULT_PROVIDER_SUBDIR} CACHE STRING "Subdirectory where providers will be installed")
SET (QGIS_INCLUDE_SUBDIR ${DEFAULT_INCLUDE_SUBDIR} CACHE STRING "Subdirectory where header files will be installed")

# mark *_SUBDIR variables as advanced as this is not something
# that an average user would use
MARK_AS_ADVANCED (QGIS_BIN_SUBDIR QGIS_CGIBIN_SUBDIR QGIS_LIB_SUBDIR QGIS_LIBEXEC_SUBDIR QGIS_DATA_SUBDIR QGIS_PROVIDER_SUBDIR QGIS_PLUGIN_SUBDIR QGIS_INCLUDE_SUBDIR)
MARK_AS_ADVANCED (QGIS_BIN_SUBDIR QGIS_CGIBIN_SUBDIR QGIS_LIB_SUBDIR QGIS_LIBEXEC_SUBDIR QGIS_DATA_SUBDIR QGIS_PLUGIN_SUBDIR QGIS_INCLUDE_SUBDIR)

# full paths for the installation
SET (QGIS_BIN_DIR ${QGIS_BIN_SUBDIR})
@@ -391,7 +386,6 @@ SET (QGIS_LIB_DIR ${QGIS_LIB_SUBDIR})
SET (QGIS_LIBEXEC_DIR ${QGIS_LIBEXEC_SUBDIR})
SET (QGIS_DATA_DIR ${QGIS_DATA_SUBDIR})
SET (QGIS_PLUGIN_DIR ${QGIS_PLUGIN_SUBDIR})
SET (QGIS_PROVIDER_DIR ${QGIS_PROVIDER_SUBDIR})
SET (QGIS_INCLUDE_DIR ${QGIS_INCLUDE_SUBDIR})

# set the default locations where the targets (executables, libraries) will land when compiled
@@ -21,7 +21,6 @@
#define RELEASE_NAME "${RELEASE_NAME}"

#define QGIS_PLUGIN_SUBDIR "${QGIS_PLUGIN_SUBDIR}"
#define QGIS_PROVIDER_SUBDIR "${QGIS_PROVIDER_SUBDIR}"
#define QGIS_DATA_SUBDIR "${QGIS_DATA_SUBDIR}"
#define QGIS_LIBEXEC_SUBDIR "${QGIS_LIBEXEC_SUBDIR}"
#define QGIS_LIB_SUBDIR "${QGIS_LIB_SUBDIR}"
@@ -11,11 +11,11 @@ body{
font-weight: bold;
color: #800000;
}
h1, span.header{
span.header{
font-family: trebuchet,arial,helvetica,sans;
font-size: 18pt;
}
h2, span.subheader{
span.subheader{
font-family: trebuchet,arial,helvetica,sans;
font-size: 14pt;
font-weight: normal;
@@ -27,7 +27,14 @@ dt{
ul.small{
font-size: 9pt;
}
h2{
font-size: 14pt;
font-family: trebuchet,arial,helvetica,sans;
font-weight: normal;
}
a.link.bar{
font-size: 9pt;
font-style: italic;
}
}
}
@@ -2,7 +2,4 @@ INSTALL(FILES srs.db qgis.db qgis_help.db symbology-ng-style.xml spatialite.db c
DESTINATION ${QGIS_DATA_DIR}/resources)

ADD_SUBDIRECTORY(context_help)
ADD_SUBDIRECTORY(js)
ADD_SUBDIRECTORY(html)
ADD_SUBDIRECTORY(css)
ADD_SUBDIRECTORY(function_help)

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit 5193f60

Please sign in to comment.