Skip to content
Permalink
Browse files

Fix windows build

  • Loading branch information
jef-n committed Sep 9, 2015
1 parent 1c0b607 commit 86ffda6f5853d79f301067d571a4482993461fa8
Showing with 5 additions and 5 deletions.
  1. +2 −2 src/providers/grass/qgsgrassvector.h
  2. +3 −3 src/python/qgspythonutilsimpl.cpp
@@ -24,7 +24,7 @@

#include "qgsgrass.h"

class QgsGrassVectorLayer : public QObject
class GRASS_LIB_EXPORT QgsGrassVectorLayer : public QObject
{
Q_OBJECT
public:
@@ -73,7 +73,7 @@ class QgsGrassVectorLayer : public QObject
QString mError;
};

class QgsGrassVector : public QObject
class GRASS_LIB_EXPORT QgsGrassVector : public QObject
{
Q_OBJECT
public:
@@ -73,7 +73,7 @@ bool QgsPythonUtilsImpl::checkSystemImports()
// locally installed plugins have priority over the system plugins
// use os.path.expanduser to support usernames with special characters (see #2512)
QStringList pluginpaths;
Q_FOREACH ( const QString& p, extraPluginsPaths() )
Q_FOREACH( QString p, extraPluginsPaths() )
{
if ( !QDir( p ).exists() )
{
@@ -83,7 +83,7 @@ bool QgsPythonUtilsImpl::checkSystemImports()
msg->showMessage();
}
#ifdef Q_OS_WIN
p = p.replace( '\\', "\\\\" );
p.replace( '\\', "\\\\" );
#endif
// we store here paths in unicode strings
// the str constant will contain utf8 code (through runString)
@@ -111,7 +111,7 @@ bool QgsPythonUtilsImpl::checkSystemImports()
// set PyQt4 api versions
QStringList apiV2classes;
apiV2classes << "QDate" << "QDateTime" << "QString" << "QTextStream" << "QTime" << "QUrl" << "QVariant";
Q_FOREACH ( const QString& clsName, apiV2classes )
Q_FOREACH( const QString& clsName, apiV2classes )
{
if ( !runString( QString( "sip.setapi('%1', 2)" ).arg( clsName ),
QObject::tr( "Couldn't set SIP API versions." ) + "\n" + QObject::tr( "Python support will be disabled." ) ) )

0 comments on commit 86ffda6

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