Skip to content

Commit b281eca

Browse files
author
timlinux
committed
Added sources for pg support to win build
Link to libpg.dll in win now Removed some ifdefs I had put in app and vectorlayer props to prevent pgis related stuff appearing in the gui git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6079 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent ca2fbfc commit b281eca

File tree

3 files changed

+11
-19
lines changed

3 files changed

+11
-19
lines changed

src/gui/guilib.pro

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ CONFIG(debug, debug|release){
2323
TARGET = $$member(TARGET, 0)-debug
2424
}
2525
LIBS += $${GDALLIBADD}
26-
#LIBS += $${SQLITELIBADD}
26+
LIBS += $${POSTGRESLIBADD}
2727
#LIBS += $${GEOSLIBADD}
2828
#LIBS += $${PROJLIBADD}
2929
LIBS += $${QGISCORELIBADD}
@@ -131,7 +131,11 @@ HEADERS = \
131131
../composer/qgscomposerscalebar.h \
132132
../composer/qgscomposervectorlegend.h \
133133
../composer/qgscomposerview.h \
134-
../composer/qgscomposition.h
134+
../composer/qgscomposition.h \
135+
qgsdbsourceselect.h \
136+
qgsnewconnection.h \
137+
qgspgquerybuilder.h \
138+
qgspgutil.h #from pg lib
135139

136140
SOURCES = \
137141
qgisapp.cpp \ # needed to ensure ui gets build for qgsiface
@@ -223,18 +227,10 @@ SOURCES = \
223227
../composer/qgscomposerscalebar.cpp \
224228
../composer/qgscomposervectorlegend.cpp \
225229
../composer/qgscomposerview.cpp \
226-
../composer/qgscomposition.cpp
230+
../composer/qgscomposition.cpp \
231+
qgsdbsourceselect.cpp \
232+
qgsnewconnection.cpp \
233+
qgspgquerybuilder.cpp \
234+
qgspgutil.cpp # from pg lib
227235

228236

229-
# Postgres specific compilation
230-
# qgsdbsourceselect.h
231-
#qgsnewconnection.h
232-
#qgspgquerybuilder.h
233-
#qgspgutil.h #from pg lib
234-
235-
#qgsdbsourceselect.cpp
236-
#qgsnewconnection.cpp
237-
#qgspgquerybuilder.cpp
238-
#qgspgutil.cpp # from pg lib
239-
#
240-

src/gui/qgisapp.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,11 +140,9 @@
140140
#include <ApplicationServices/ApplicationServices.h>
141141
#endif
142142

143-
#ifndef WIN32
144143
#ifdef HAVE_POSTGRESQL
145144
#include "qgsdbsourceselect.h"
146145
#endif
147-
#endif
148146

149147
#ifndef WIN32
150148
#include <dlfcn.h>

src/gui/qgsvectorlayerproperties.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,10 @@
2828
#include "qgsuniquevaluedialog.h"
2929
#include "qgsvectordataprovider.h"
3030
#include "qgsvectorlayer.h"
31-
#ifndef WIN32
3231
#ifdef HAVE_POSTGRESQL
3332
#include "qgspgquerybuilder.h"
3433
#include "../providers/postgres/qgspostgresprovider.h"
3534
#endif
36-
#endif
3735

3836
#include <QMessageBox>
3937

0 commit comments

Comments
 (0)