Skip to content

Commit

Permalink
Merge pull request #7798 from m-kuhn/enableTravisWarnings
Browse files Browse the repository at this point in the history
Re-enable travis checks for build warnings
  • Loading branch information
m-kuhn committed Sep 6, 2018
2 parents 4ce10fc + 351eb57 commit d79d911
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
4 changes: 3 additions & 1 deletion .ci/travis/linux/docker-build-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@ cmake \
-DWITH_SERVER=ON \
-DDISABLE_DEPRECATED=ON \
-DPYTHON_TEST_WRAPPER="timeout -sSIGSEGV 55s"\
-DCXX_EXTRA_FLAGS="${CLANG_WARNINGS}" ..
-DCXX_EXTRA_FLAGS="${CLANG_WARNINGS}" \
-DWERROR=TRUE \
..
echo "travis_fold:end:cmake"

#######
Expand Down
4 changes: 4 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,10 @@ IF (PEDANTIC)
ELSE (MSVC)
# add warnings via flags (not as definitions as on Mac -Wall can not be overridden per language )
SET(_warnings "-Wall -Wextra -Wno-long-long -Wformat-security -Wno-strict-aliasing")
SET(WERROR FALSE CACHE BOOL "Treat build warnings as errors.")
IF (WERROR)
SET(_warnings "${_warnings} -Werror")
ENDIF(WERROR)
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${_warnings}")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_warnings}")

Expand Down
2 changes: 1 addition & 1 deletion src/server/qgsservercachefilter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
#include <QDomDocument>

QgsServerCacheFilter::QgsServerCacheFilter( const QgsServerInterface *serverInterface )
: mServerInterface( serverInterface )
{
Q_UNUSED( serverInterface );
}

QByteArray QgsServerCacheFilter::getCachedDocument( const QgsProject *project, const QgsServerRequest &request, const QString &key ) const
Expand Down
5 changes: 0 additions & 5 deletions src/server/qgsservercachefilter.h
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,6 @@ class SERVER_EXPORT QgsServerCacheFilter
*/
virtual bool deleteCachedImages( const QgsProject *project ) const;

private:

//! The server interface
const QgsServerInterface *mServerInterface = nullptr;

};

//! The registry definition
Expand Down

0 comments on commit d79d911

Please sign in to comment.