fix windows build (also reapplies 584f192, lost in a6f1ec)

jef-n · jef-n · commit 97864da3581c · 2015-05-23T20:49:51.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -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}")
diff --git a/src/providers/grass/qgsgrassimport.cpp b/src/providers/grass/qgsgrassimport.cpp
@@ -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;
         }

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,6 @@`
`13`	`13`	`* (at your option) any later version. *`
`14`	`14`	`* *`
`15`	`15`	`***************************************************************************/`
`16`		`-#include <unistd.h>`
`17`		`-`
`18`	`16`	`#include <QByteArray>`
`19`	`17`	`#include <QtConcurrentRun>`
`20`	`18`
`@@ -216,7 +214,7 @@ bool QgsGrassRasterImport::import()`
`216`	`214`	`{`
`217`	`215`	`if ( !block->convert( qgis_out_type ) )`
`218`	`216`	`{`
`219`		`- setError( "cannot vonvert data type" );`
	`217`	`+ setError( "cannot convert data type" );`
`220`	`218`	`delete block;`
`221`	`219`	`return false;`
`222`	`220`	`}`