Skip to content
Permalink
Browse files
fix windows build (also reapplies 584f192, lost in a6f1ec)
  • Loading branch information
jef-n committed May 23, 2015
1 parent 32463d0 commit 97864da3581c8a9eff6110001f0a11c2acf08ab5
Showing with 1 addition and 5 deletions.
  1. +0 −2 CMakeLists.txt
  2. +1 −3 src/providers/grass/qgsgrassimport.cpp
@@ -593,8 +593,6 @@ ELSE (WIN32)

ENDIF(WIN32)

SET(DLLIMPORT "")

ADD_DEFINITIONS("-DCORE_EXPORT=${DLLIMPORT}")
ADD_DEFINITIONS("-DGUI_EXPORT=${DLLIMPORT}")
ADD_DEFINITIONS("-DPYTHON_EXPORT=${DLLIMPORT}")
@@ -13,8 +13,6 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include <unistd.h>

#include <QByteArray>
#include <QtConcurrentRun>

@@ -216,7 +214,7 @@ bool QgsGrassRasterImport::import()
{
if ( !block->convert( qgis_out_type ) )
{
setError( "cannot vonvert data type" );
setError( "cannot convert data type" );
delete block;
return false;
}

1 comment on commit 97864da

@m-kuhn

This comment has been minimized.

Copy link
Member

@m-kuhn m-kuhn commented on 97864da May 23, 2015

Thanks @jef-n The meaning was actually to get less "Fix Windows Build" commit messages, not more ;)

Please sign in to comment.