sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-03 00:02:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

modified postgres checking

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@250 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
gsherman 2003-08-28 03:07:32 +00:00
parent fd4ee9da2e
commit eaa86c1b6b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qgis/src/qgsprojectio.cpp
View File

@ -19,7 +19,7 @@
#include <qmessagebox.h>
#include <qcolor.h>
#include "qgsmaplayer.h"
#ifdef PGDB
#ifdef POSTGRESQL
#include "qgsdatabaselayer.h"
#endif
#include "qgsshapefilelayer.h"
@ -155,7 +155,7 @@ bool QgsProjectIo::read(){
// add the layer to the maplayer
if(type == "database"){
#ifdef PGDB
#ifdef POSTGRESQL
QgsDatabaseLayer *dbl = new QgsDatabaseLayer(dataSource, layerName);
map->addLayer(dbl);

6
qgis/src/src.pro
View File

@ -81,10 +81,10 @@ TARGET = qgis
#.............................
#PostgreSQL support
#.............................
contains (DEFINES, postgres){
contains (DEFINES, POSTGRESQL){
message ("Checking PostgreSQL environment")
}
contains ( DEFINES, postgres ){
contains ( DEFINES, POSTGRESQL ){
MYPGSQL=$$(PGSQL)
count(MYPGSQL, 1){
message ("PGSQL environment variable is defined")
@ -93,7 +93,7 @@ message ("PGSQL environment variable is defined")
message ( "Configuring to build with PostgreSQL support" )
LIBS += -L$(PGSQL)/lib -lpq++
INCLUDEPATH += $(PGSQL)/include
DEFINES += PGDB HAVE_NAMESPACE_STD HAVE_CXX_STRING_HEADER DLLIMPORT=""
DEFINES += HAVE_NAMESPACE_STD HAVE_CXX_STRING_HEADER DLLIMPORT=""
SOURCES += qgsdatabaselayer.cpp \
qgsdbsourceselect.cpp \
qgsnewconnection.cpp