remove pseudo options HAVE_MSSQL, HAVE_DB2, HAVE_SPATIALITE

and HAVE_PYTHON

Author: jef-n

CMakeLists.txt

@@ -233,16 +233,6 @@ IF (POSTGRES_FOUND)
   SET (HAVE_POSTGRESQL TRUE)
 ENDIF (POSTGRES_FOUND)
 
-# following variable is used in qgsconfig.h
-SET (HAVE_SPATIALITE TRUE)
-
-# following variable is used in qgsconfig.h
-SET (HAVE_MSSQL TRUE)
-
-
-# following variable is used in qgsconfig.h
-SET (HAVE_DB2 TRUE)
-
 SET (WITH_QTWEBKIT TRUE CACHE INTERNAL "Enable QtWebkit support")
 IF (WITH_QTWEBKIT)
   ADD_DEFINITIONS(-DWITH_QTWEBKIT)

cmake_templates/qgsconfig.h.in

@@ -42,16 +42,8 @@
 
 #cmakedefine HAVE_POSTGRESQL
 
-#cmakedefine HAVE_SPATIALITE
-
-#cmakedefine HAVE_MSSQL
-
-#cmakedefine HAVE_DB2
-
 #cmakedefine HAVE_ORACLE
 
-#cmakedefine HAVE_PYTHON
-
 #cmakedefine HAVE_TOUCH
 
 #cmakedefine HAVE_OSGEARTHQT

src/app/qgisapp.cpp

@@ -1551,16 +1551,6 @@ void QgisApp::createActions()
   mActionAddPgLayer = 0;
 #endif
 
-#ifndef HAVE_MSSQL
-  delete mActionAddMssqlLayer;
-  mActionAddMssqlLayer = 0;
-#endif
-
-#ifndef HAVE_DB2
-  delete mActionAddDb2Layer;
-  mActionAddDb2Layer = 0;
-#endif
-
 #ifndef HAVE_ORACLE
   delete mActionAddOracleLayer;
   mActionAddOracleLayer = nullptr;
@@ -2224,12 +2214,8 @@ void QgisApp::setTheme( const QString& theThemeName )
 #endif
   mActionNewSpatiaLiteLayer->setIcon( QgsApplication::getThemeIcon( "/mActionNewSpatiaLiteLayer.svg" ) );
   mActionAddSpatiaLiteLayer->setIcon( QgsApplication::getThemeIcon( "/mActionAddSpatiaLiteLayer.svg" ) );
-#ifdef HAVE_MSSQL
   mActionAddMssqlLayer->setIcon( QgsApplication::getThemeIcon( "/mActionAddMssqlLayer.svg" ) );
-#endif
-#ifdef HAVE_DB2
   mActionAddDb2Layer->setIcon( QgsApplication::getThemeIcon( "/mActionAddDb2Layer.svg" ) );
-#endif
 #ifdef HAVE_ORACLE
   mActionAddOracleLayer->setIcon( QgsApplication::getThemeIcon( "/mActionAddOracleLayer.svg" ) );
 #endif
@@ -3866,7 +3852,6 @@ void QgisApp::replaceSelectedVectorLayer( const QString& oldId, const QString& u
 
 void QgisApp::addMssqlLayer()
 {
-#ifdef HAVE_MSSQL
   // show the MSSQL dialog
   QDialog *dbs = dynamic_cast<QDialog*>( QgsProviderRegistry::instance()->selectWidget( "mssql", this ) );
   if ( !dbs )
@@ -3878,12 +3863,10 @@ void QgisApp::addMssqlLayer()
            this, SLOT( addDatabaseLayers( QStringList const &, QString const & ) ) );
   dbs->exec();
   delete dbs;
-#endif
 } // QgisApp::addMssqlLayer()
 
 void QgisApp::addDb2Layer()
 {
-#ifdef HAVE_DB2
   // show the DB2 dialog
   QgsDebugMsg( "Show dialog for DB2 " );
   QDialog *dbs = dynamic_cast<QDialog*>( QgsProviderRegistry::instance()->selectWidget( "DB2", this ) );
@@ -3896,7 +3879,6 @@ void QgisApp::addDb2Layer()
            this, SLOT( addDatabaseLayers( QStringList const &, QString const & ) ) );
   dbs->exec();
   delete dbs;
-#endif
 } // QgisApp::addDb2Layer()
 
 void QgisApp::addOracleLayer()

src/app/qgisapp.h

@@ -717,14 +717,10 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
     void addSelectedVectorLayer( const QString& uri, const QString& layerName, const QString& provider );
     //! Replace the selected layer by a vector layer defined by uri, layer name, data source uri
     void replaceSelectedVectorLayer( const QString& oldId, const QString& uri, const QString& layerName, const QString& provider );
-    //#ifdef HAVE_MSSQL
     //! Add a MSSQL layer to the map
     void addMssqlLayer();
-    //#endif
-    //#ifdef HAVE_DB2
     //! Add a DB2 layer to the map
     void addDb2Layer();
-    //#endif
     //#ifdef HAVE_ORACLE
     //! Add a Oracle layer to the map
     void addOracleLayer();