Merge pull request #11188 from mshabunin:fix-clang-warnings

7 years ago · 1b7aa92eb6
parent 177be2adda 439072a2a6
commit 1b7aa92eb6
2 changed files with 4 additions and 1 deletions
--- a/modules/highgui/src/window_QT.cpp
+++ b/modules/highgui/src/window_QT.cpp
@ -44,7 +44,7 @@

 #include <memory>

-#include <window_QT.h>
+#include "window_QT.h"

 #include <math.h>

--- a/modules/ts/include/opencv2/ts.hpp
+++ b/modules/ts/include/opencv2/ts.hpp
@ -63,6 +63,9 @@
 # endif
 #endif

+#if defined(__OPENCV_BUILD) && defined(__clang__)
+#pragma clang diagnostic ignored "-Winconsistent-missing-override"
+#endif
 #if defined(__OPENCV_BUILD) && defined(__GNUC__) && __GNUC__ >= 5
 //#pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wsuggest-override"