Revert "Merge branch 'master' of github.com:qgis/Quantum-GIS into qgi…

…s-master" This reverts commit 78ce3cd, reversing changes made to 2414a3a.
qgis · Nov 30, 2011 · 5193f60 · 5193f60
1 parent 78ce3cd
commit 5193f60
Show file tree

Hide file tree

Showing 77 changed files with 315 additions and 18,044 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -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

diff --git a/cmake_templates/qgsconfig.h.in b/cmake_templates/qgsconfig.h.in
@@ -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}"

diff --git a/resources/css/qgisdoc.css → doc/qgisdoc.css b/resources/css/qgisdoc.css → doc/qgisdoc.css
@@ -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;
+}
+  }
 }
diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
@@ -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)
diff --git a/resources/css/CMakeLists.txt b/resources/css/CMakeLists.txt
diff --git a/resources/css/ie.css b/resources/css/ie.css
diff --git a/resources/css/print.css b/resources/css/print.css