Skip to content
Permalink
Browse files

Added some win ifdeffing. The postgris provider does not inherit from…

… QObjects so declaring signals and slots cause the qlibrary loader to throw a wobbly when trying to load the plugin. I tried making it inherit QObject but that wont compile due to ambiguous base class. So for no the signals are commented out. This should have little impact except removing a small feedback event when calculating recordset sizes....

git-svn-id: http://svn.osgeo.org/qgis/trunk@6184 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux
timlinux committed Dec 4, 2006
1 parent ce2ece0 commit 6db1c3ef117485635260029a4fd60b2ebf660dbd
@@ -21,14 +21,16 @@ TEMPLATE = lib
CONFIG(debug, debug|release){
TARGET = $$member(TARGET, 0)-debug
}
LIBS += $${GDALLIBADD}
#LIBS += $${GDALLIBADD}
LIBS += $${GEOSLIBADD}
LIBS += $${PROJLIBADD}
LIBS += $${POSTGRESLIBADD}
LIBS += $${QGISCORELIBADD}
LIBS += $${QGISGUILIBADD}
LIBS += $${QGISPROJECTIONSELECTORLIBADD}
DESTDIR=$${QGISPROVIDERDIR}
QT += qt3support svg core gui xml network
#QT += qt3support svg core gui xml network
QT += core gui qt3support xml
message("Building libs into $${DESTDIR}")

HEADERS += qgspostgresprovider.h \
@@ -64,7 +64,7 @@ const QString POSTGRES_DESCRIPTION = "PostgreSQL/PostGIS data provider";


QgsPostgresProvider::QgsPostgresProvider(QString const & uri)
: QgsVectorDataProvider(uri),
: QgsVectorDataProvider(uri),
geomType(QGis::WKBUnknown),
gotPostgisVersion(FALSE)
{
@@ -2510,7 +2510,9 @@ void QgsPostgresProvider::customEvent( QCustomEvent * e )

QgsDebugMsg("QgsPostgresProvider: emitting fullExtentCalculated()");

#ifndef WIN32 //temporary hack for native win build
emit fullExtentCalculated();
#endif

// TODO: Only uncomment this when the overview map canvas has been subclassed
// from the QgsMapCanvas
@@ -53,10 +53,13 @@ class QgsGeometry;
interface defined in the QgsDataProvider class to provide access to spatial
data residing in a PostgreSQL/PostGIS enabled database.
*/
class QgsPostgresProvider:public QgsVectorDataProvider
class QgsPostgresProvider: public QgsVectorDataProvider
{


#ifndef WIN32 //temporary hack for native win build
Q_OBJECT
#endif

public:
/**
@@ -331,6 +334,7 @@ class QgsPostgresProvider:public QgsVectorDataProvider



#ifndef WIN32 //temporary hack for native win build
signals:
/**
* This is emitted whenever the worker thread has fully calculated the
@@ -350,6 +354,7 @@ class QgsPostgresProvider:public QgsVectorDataProvider
* when the user adjusts the extent of the main map canvas.
*/
void repaintRequested();
#endif

private:

0 comments on commit 6db1c3e

Please sign in to comment.
You can’t perform that action at this time.