Merge pull request #5098 from syershov/fix-warningsbeta-548

Fix warnings

6 files changed, 29 insertions, 5 deletions

diff --git a/3party/liboauthcpp/liboauthcpp.pro b/3party/liboauthcpp/liboauthcpp.pro
index 0600961cfe..4db51249ac 100644
--- a/3party/liboauthcpp/liboauthcpp.pro
+++ b/3party/liboauthcpp/liboauthcpp.pro
@@ -2,6 +2,10 @@ TARGET = oauthcpp
 ROOT_DIR = ../..
 include($$ROOT_DIR/common.pri)
 
+unix|win32-g++ {
+  QMAKE_CXXFLAGS_WARN_ON = -w
+}
+
 INCLUDEPATH += src include
 
 TEMPLATE = lib
diff --git a/3party/opening_hours/opening_hours_integration_tests/opening_hours_integration_tests.cpp b/3party/opening_hours/opening_hours_integration_tests/opening_hours_integration_tests.cpp
index b070928b5b..fb1ae4eaf5 100644
--- a/3party/opening_hours/opening_hours_integration_tests/opening_hours_integration_tests.cpp
+++ b/3party/opening_hours/opening_hours_integration_tests/opening_hours_integration_tests.cpp
@@ -7,10 +7,19 @@
 #include <ctime>
 #include <map>
 
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-parameter"
+#endif
+
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/test/included/unit_test.hpp>
 
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+
 namespace
 {
 template <typename T>
diff --git a/3party/osrm/osrm.pro b/3party/osrm/osrm.pro
index 300ce8cadf..2dca2c5dd9 100644
--- a/3party/osrm/osrm.pro
+++ b/3party/osrm/osrm.pro
@@ -8,6 +8,10 @@ ROOT_DIR = ../..
 
 include($$ROOT_DIR/common.pri)
 
+unix|win32-g++ {
+  QMAKE_CXXFLAGS_WARN_ON = -w
+}
+
 DEFINES *= BOOST_ERROR_CODE_HEADER_ONLY
 INCLUDEPATH *= osrm-backend/include \
      osrm-backend/third_party
diff --git a/3party/protobuf/protobuf.pro b/3party/protobuf/protobuf.pro
index 9cacd0f4af..747b1dcdae 100644
--- a/3party/protobuf/protobuf.pro
+++ b/3party/protobuf/protobuf.pro
@@ -17,7 +17,7 @@ win32-msvc* {
 }
 
 unix|win32-g++ {
-  QMAKE_CXXFLAGS_WARN_ON += -Wno-unused -Wno-extra
+  QMAKE_CXXFLAGS_WARN_ON = -w
 }
 
 
diff --git a/coding/internal/xmlparser.hpp b/coding/internal/xmlparser.hpp
index 4c7618f777..3bdb091748 100644
--- a/coding/internal/xmlparser.hpp
+++ b/coding/internal/xmlparser.hpp
@@ -1,11 +1,18 @@
 #pragma once
 
-#define XML_STATIC
+#include "base/logging.hpp"
 
-#include "3party/expat/expat_impl.h"
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-parameter"
+#endif
 
-#include "base/logging.hpp"
+#define XML_STATIC
+#include "3party/expat/expat_impl.h"
 
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
 
 template <typename DispatcherT>
 class XmlParser : public CExpatImpl< XmlParser<DispatcherT> >
diff --git a/common.pri b/common.pri
index ade22ff905..669cdd8c87 100644
--- a/common.pri
+++ b/common.pri
@@ -127,7 +127,7 @@ win32-msvc201* {
 # unix also works for Android
 unix|win32-g++ {
   LIBS *= -lz
-  QMAKE_CXXFLAGS_WARN_ON += -Wno-strict-aliasing -Wsign-compare 
+  QMAKE_CXXFLAGS_WARN_ON += -Wno-strict-aliasing -Wsign-compare -Wno-unused-parameter
   # -Wno-unused-local-typedef is not supported on clang 3.5.
   IS_CLANG35 = $$system( echo | $$QMAKE_CXX -dM -E - | grep '__clang_version__.*3\.5.*' )
   if (isEmpty(IS_CLANG35)){