Skip to content

Commit b53e986

Browse files
authored
Merge pull request #5170 from nyalldawson/drop_spatial_query
Drop spatial query plugin
2 parents 281236f + 7048d73 commit b53e986

31 files changed

+3
-3084
lines changed

cmake/FindQGIS.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ IF(WIN32)
3636
#MESSAGE("Searching for QGIS in $ENV{PROGRAMFILES}/QGIS")
3737
IF (MINGW)
3838
FIND_PATH(QGIS_PLUGIN_DIR
39-
NAMES libspatialqueryplugin.dll
39+
NAMES libofflineeditingplugin.dll
4040
PATHS
4141
"$ENV{PROGRAMFILES}/QGIS/plugins"
4242
)
@@ -59,7 +59,7 @@ IF(WIN32)
5959

6060
IF (MSVC)
6161
FIND_PATH(QGIS_PLUGIN_DIR
62-
NAMES spatialqueryplugin.dll
62+
NAMES offlineeditingplugin.dll
6363
PATHS
6464
"$ENV{OSGEO4W_ROOT}/apps/${OSGEO4W_QGIS_SUBDIR}/plugins"
6565
"$ENV{PROGRAMFILES}/QGIS/plugins"
@@ -105,7 +105,7 @@ ELSE(WIN32)
105105
IF(UNIX)
106106
#MESSAGE("Searching for QGIS in /usr/bin; /usr/local/bin")
107107
FIND_PATH(QGIS_PLUGIN_DIR
108-
NAMES libspatialqueryplugin.so
108+
NAMES libofflineeditingplugin.so
109109
PATHS
110110
${QGIS_BUILD_PATH}/PlugIns/qgis
111111
${QGIS_MAC_PATH}/PlugIns/qgis

debian/qgis.install

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ usr/lib/qgis/plugins/libgeorefplugin.so
22
usr/lib/qgis/plugins/libgpsimporterplugin.so
33
usr/lib/qgis/plugins/libcoordinatecaptureplugin.so
44
usr/lib/qgis/plugins/libevis.so
5-
usr/lib/qgis/plugins/libspatialqueryplugin.so
65
usr/lib/qgis/plugins/libofflineeditingplugin.so
76
usr/lib/qgis/plugins/libtopolplugin.so
87
usr/lib/qgis/plugins/libgeometrycheckerplugin.so

ms-windows/osgeo4w/package.cmd

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,6 @@ tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%/%PACKAGENAME%-%VERS
382382
"apps/%PACKAGENAME%/plugins/georefplugin.dll" ^
383383
"apps/%PACKAGENAME%/plugins/gpsimporterplugin.dll" ^
384384
"apps/%PACKAGENAME%/plugins/offlineeditingplugin.dll" ^
385-
"apps/%PACKAGENAME%/plugins/spatialqueryplugin.dll" ^
386385
"apps/%PACKAGENAME%/plugins/topolplugin.dll" ^
387386
"apps/%PACKAGENAME%/plugins/geometrycheckerplugin.dll" ^
388387
"apps/%PACKAGENAME%/qtplugins/sqldrivers/qsqlspatialite.dll" ^

ms-windows/plugins.nsh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS3\Plugins" "globeplugin" "false
1515
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS3\Plugins" "gpsimporterplugin" "true"
1616
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS3\Plugins" "grassplugin" "true"
1717
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS3\Plugins" "offlineeditingplugin" "true"
18-
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS3\Plugins" "spatialqueryplugin" "true"
1918
WriteRegStr HKEY_CURRENT_USER "Software\QGIS\QGIS3\Plugins" "topolplugin" "true"
2019

2120
############################### reg2nsis end #################################

src/plugins/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${QGIS_OUTPUT_DIRECTORY}/${QGIS_PLUGIN_SUBDI
88

99
ADD_SUBDIRECTORY(coordinate_capture)
1010
ADD_SUBDIRECTORY(evis)
11-
ADD_SUBDIRECTORY(spatialquery)
1211
ADD_SUBDIRECTORY(gps_importer)
1312
ADD_SUBDIRECTORY(topology)
1413
ADD_SUBDIRECTORY(offline_editing)

src/plugins/spatialquery/CMakeLists.txt

Lines changed: 0 additions & 64 deletions
This file was deleted.

src/plugins/spatialquery/README

Lines changed: 0 additions & 7 deletions
This file was deleted.
-1021 Bytes
Binary file not shown.

src/plugins/spatialquery/qgsgeometrycoordinatetransform.cpp

Lines changed: 0 additions & 57 deletions
This file was deleted.

src/plugins/spatialquery/qgsgeometrycoordinatetransform.h

Lines changed: 0 additions & 75 deletions
This file was deleted.

0 commit comments

Comments
 (0)