Skip to content

Commit 2795529

Browse files
committed
fix windows build
1 parent b6c7804 commit 2795529

File tree

5 files changed

+11
-15
lines changed

5 files changed

+11
-15
lines changed

src/providers/grass/qgsgrassrasterprovider.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,9 @@ double QgsGrassRasterProvider::noDataValue() const
273273
else
274274
{
275275
if ( mGrassDataType != FCELL_TYPE )
276+
{
276277
QgsDebugMsg( "unexpected data type" );
278+
}
277279

278280
// limit: 3.40282347e+38
279281
nul = -1e+30;

src/providers/wcs/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ SET (WCS_SRCS
66
qgswcssourceselect.cpp
77
qgswcsdataitems.cpp
88
)
9+
910
SET (WCS_MOC_HDRS
10-
../gdal/qgsgdalproviderbase.h
1111
qgswcsprovider.h
1212
qgswcscapabilities.h
1313
qgswcssourceselect.h

src/providers/wcs/qgswcsdataitems.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,8 +261,8 @@ QWidget * QgsWCSRootItem::paramWidget()
261261
QgsWCSSourceSelect *select = new QgsWCSSourceSelect( 0, 0, true, true );
262262
connect( select, SIGNAL( connectionsChanged() ), this, SLOT( connectionsChanged() ) );
263263
return select;
264-
return 0;
265264
}
265+
266266
void QgsWCSRootItem::connectionsChanged()
267267
{
268268
refresh();

src/providers/wfs/CMakeLists.txt

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,13 @@ SET(WFS_SRCS
1212
)
1313

1414
SET (WFS_MOC_HDRS
15-
qgswfsdata.h
16-
qgswfscapabilities.h
17-
qgswfsdataitems.h
18-
qgswfsprovider.h
19-
qgswfssourceselect.h
15+
qgswfsdata.h
16+
qgswfscapabilities.h
17+
qgswfsdataitems.h
18+
qgswfsprovider.h
19+
qgswfssourceselect.h
2020
)
2121

22-
#IF(NOT MSVC)
23-
# IF (PEDANTIC)
24-
# MESSAGE("providers/wfs : -Werror removed for qgswfsprovider.cpp for now - please get rid of any compiler warnings!")
25-
# ENDIF (PEDANTIC)
26-
# SET_SOURCE_FILES_PROPERTIES(qgswfsprovider.cpp PROPERTIES COMPILE_FLAGS -Wno-error )
27-
#ENDIF (NOT MSVC)
2822
########################################################
2923
# Build
3024

tests/src/providers/testqgswcsprovider.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ double TestQgsWcsProvider::tolerance( double val, int places )
298298
{
299299
// float precission is about 7 decimal digits, double about 16
300300
// default places = 6
301-
return 1. * pow( 10, round( log10( qAbs( val ) ) - places ) );
301+
return 1. * qPow( 10, qRound( log10( qAbs( val ) ) - places ) );
302302
}
303303

304304
QString TestQgsWcsProvider::compareHead()
@@ -316,7 +316,7 @@ void TestQgsWcsProvider::compare( QString theParamName, int wcsVal, int gdalVal,
316316
bool TestQgsWcsProvider::compare( double wcsVal, double gdalVal, double theTolerance )
317317
{
318318
// values may be nan
319-
return ( std::isnan( wcsVal ) && std::isnan( gdalVal ) ) || ( qAbs( wcsVal - gdalVal ) <= theTolerance );
319+
return ( qIsNaN( wcsVal ) && qIsNaN( gdalVal ) ) || ( qAbs( wcsVal - gdalVal ) <= theTolerance );
320320
}
321321

322322
void TestQgsWcsProvider::compare( QString theParamName, double wcsVal, double gdalVal, QString &theReport, bool &theOk, double theTolerance )

0 commit comments

Comments
 (0)