Merge pull request #5170 from nyalldawson/drop_spatial_query

Drop spatial query plugin
qgis · Sep 18, 2017 · b53e986 · b53e986
2 parents 281236f + 7048d73
commit b53e986
Show file tree

Hide file tree

Showing 31 changed files with 3 additions and 3,084 deletions.
diff --git a/cmake/FindQGIS.cmake b/cmake/FindQGIS.cmake
@@ -36,7 +36,7 @@ IF(WIN32)
   #MESSAGE("Searching for QGIS in $ENV{PROGRAMFILES}/QGIS")
   IF (MINGW)
     FIND_PATH(QGIS_PLUGIN_DIR
-      NAMES libspatialqueryplugin.dll
+      NAMES libofflineeditingplugin.dll
       PATHS
         "$ENV{PROGRAMFILES}/QGIS/plugins"
     )
@@ -59,7 +59,7 @@ IF(WIN32)
 
   IF (MSVC)
     FIND_PATH(QGIS_PLUGIN_DIR
-      NAMES spatialqueryplugin.dll
+      NAMES offlineeditingplugin.dll
       PATHS
         "$ENV{OSGEO4W_ROOT}/apps/${OSGEO4W_QGIS_SUBDIR}/plugins"
         "$ENV{PROGRAMFILES}/QGIS/plugins"
@@ -105,7 +105,7 @@ ELSE(WIN32)
   IF(UNIX)
     #MESSAGE("Searching for QGIS in /usr/bin; /usr/local/bin")
     FIND_PATH(QGIS_PLUGIN_DIR
-      NAMES libspatialqueryplugin.so
+      NAMES libofflineeditingplugin.so
       PATHS
         ${QGIS_BUILD_PATH}/PlugIns/qgis
         ${QGIS_MAC_PATH}/PlugIns/qgis

diff --git a/debian/qgis.install b/debian/qgis.install
@@ -2,7 +2,6 @@ usr/lib/qgis/plugins/libgeorefplugin.so
 usr/lib/qgis/plugins/libgpsimporterplugin.so
 usr/lib/qgis/plugins/libcoordinatecaptureplugin.so
 usr/lib/qgis/plugins/libevis.so
-usr/lib/qgis/plugins/libspatialqueryplugin.so
 usr/lib/qgis/plugins/libofflineeditingplugin.so
 usr/lib/qgis/plugins/libtopolplugin.so
 usr/lib/qgis/plugins/libgeometrycheckerplugin.so

diff --git a/ms-windows/osgeo4w/package.cmd b/ms-windows/osgeo4w/package.cmd
@@ -382,7 +382,6 @@ tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%/%PACKAGENAME%-%VERS
 	"apps/%PACKAGENAME%/plugins/georefplugin.dll" ^
 	"apps/%PACKAGENAME%/plugins/gpsimporterplugin.dll" ^
 	"apps/%PACKAGENAME%/plugins/offlineeditingplugin.dll" ^
-	"apps/%PACKAGENAME%/plugins/spatialqueryplugin.dll" ^
 	"apps/%PACKAGENAME%/plugins/topolplugin.dll" ^
 	"apps/%PACKAGENAME%/plugins/geometrycheckerplugin.dll" ^
 	"apps/%PACKAGENAME%/qtplugins/sqldrivers/qsqlspatialite.dll" ^

diff --git a/ms-windows/plugins.nsh b/ms-windows/plugins.nsh
@@ -15,7 +15,6 @@ WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS3\Plugins" "globeplugin" "false
 WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS3\Plugins" "gpsimporterplugin" "true"
 WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS3\Plugins" "grassplugin" "true"
 WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS3\Plugins" "offlineeditingplugin" "true"
-WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS3\Plugins" "spatialqueryplugin" "true"
 WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS3\Plugins" "topolplugin" "true"
 
 ###############################  reg2nsis end  #################################
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
@@ -8,7 +8,6 @@ SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${QGIS_OUTPUT_DIRECTORY}/${QGIS_PLUGIN_SUBDI
 
 ADD_SUBDIRECTORY(coordinate_capture)
 ADD_SUBDIRECTORY(evis)
-ADD_SUBDIRECTORY(spatialquery)
 ADD_SUBDIRECTORY(gps_importer)
 ADD_SUBDIRECTORY(topology)
 ADD_SUBDIRECTORY(offline_editing)

diff --git a/src/plugins/spatialquery/CMakeLists.txt b/src/plugins/spatialquery/CMakeLists.txt
diff --git a/src/plugins/spatialquery/README b/src/plugins/spatialquery/README
diff --git a/src/plugins/spatialquery/itemscreatelayer.png b/src/plugins/spatialquery/itemscreatelayer.png
diff --git a/src/plugins/spatialquery/qgsgeometrycoordinatetransform.cpp b/src/plugins/spatialquery/qgsgeometrycoordinatetransform.cpp
diff --git a/src/plugins/spatialquery/qgsgeometrycoordinatetransform.h b/src/plugins/spatialquery/qgsgeometrycoordinatetransform.h
diff --git a/src/plugins/spatialquery/qgsmngprogressbar.cpp b/src/plugins/spatialquery/qgsmngprogressbar.cpp
diff --git a/src/plugins/spatialquery/qgsmngprogressbar.h b/src/plugins/spatialquery/qgsmngprogressbar.h