diff --git a/cmake/FindQGIS.cmake b/cmake/FindQGIS.cmake index ed7ce45e85a..b31d48a871b 100644 --- a/cmake/FindQGIS.cmake +++ b/cmake/FindQGIS.cmake @@ -15,7 +15,7 @@ IF(WIN32) #MESSAGE("Searching for QGIS in $ENV{PROGRAMFILES}/Quantum GIS") IF (MINGW) FIND_PATH(QGIS_PLUGIN_DIR - NAMES libnortharrowplugin.dll + NAMES libdelimitedtextplugin.dll PATHS "$ENV{PROGRAMFILES}/Quantum GIS/plugins" ) @@ -38,7 +38,7 @@ IF(WIN32) IF (MSVC) FIND_PATH(QGIS_PLUGIN_DIR - NAMES northarrowplugin.dll + NAMES delimitedtextplugin.dll PATHS "$ENV{OSGEO4W_ROOT}/apps/qgis/plugins" "$ENV{PROGRAMFILES}/Quantum GIS/plugins" @@ -82,7 +82,7 @@ ELSE(WIN32) SET (QGIS_MAC_PATH /Applications/QGIS.app/Contents) #MESSAGE("Searching for QGIS in /usr/bin; /usr/local/bin") FIND_PATH(QGIS_PLUGIN_DIR - NAMES libnortharrowplugin.so + NAMES libdelimitedtextplugin.so PATHS /usr/lib64/qgis/plugins /usr/lib/qgis diff --git a/python/plugins/sextante/grass/GrassUtils.py b/python/plugins/sextante/grass/GrassUtils.py index 46dc0c8a6d8..eb770043968 100644 --- a/python/plugins/sextante/grass/GrassUtils.py +++ b/python/plugins/sextante/grass/GrassUtils.py @@ -340,10 +340,10 @@ class GrassUtils: return ("The specified GRASS folder does not contain a valid set of GRASS modules.\n" + "Please, go to the SEXTANTE settings dialog, and check that the GRASS\n" + "folder is correctly configured") - + settings = QSettings() if not ignoreRegistrySettings: - GRASS_INSTALLED = "/SextanteQGIS/GrassInstalled" + GRASS_INSTALLED = "/SextanteQGIS/GrassInstalled" if settings.contains(GRASS_INSTALLED): return diff --git a/python/plugins/sextante/saga/SagaUtils.py b/python/plugins/sextante/saga/SagaUtils.py index 9dd9e899d28..80df5dd44d4 100644 --- a/python/plugins/sextante/saga/SagaUtils.py +++ b/python/plugins/sextante/saga/SagaUtils.py @@ -137,7 +137,7 @@ class SagaUtils: settings = QSettings() if not ignoreRegistrySettings: - SAGA_INSTALLED = "/SextanteQGIS/SagaInstalled" + SAGA_INSTALLED = "/SextanteQGIS/SagaInstalled" if settings.contains(SAGA_INSTALLED): return