Commit 82c2262b authored by Thiago Macieira's avatar Thiago Macieira
Browse files

Disable the warning about deprecation inside qalgorithms.h


Since some of the algorithms use other ones, we should not warn about
those. The warnings are supposed to happen only in user code.

Warnings obtained with GCC 5. The Clang change is just to be on the safe
side.

Change-Id: If295899f6ff6534de7b19741d33efc0b5c4c912c
Reviewed-by: default avatarRobin Burchell <robin.burchell@viroteck.net>
parent 5c4390cc
No related merge requests found
Showing with 4 additions and 2 deletions
...@@ -37,7 +37,9 @@ ...@@ -37,7 +37,9 @@
#include <QtCore/qglobal.h> #include <QtCore/qglobal.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QT_WARNING_PUSH
QT_WARNING_DISABLE_GCC("-Wdeprecated-declarations")
QT_WARNING_DISABLE_CLANG("-Wdeprecated-declarations")
/* /*
Warning: The contents of QAlgorithmsPrivate is not a part of the public Qt API Warning: The contents of QAlgorithmsPrivate is not a part of the public Qt API
...@@ -582,7 +584,7 @@ Q_DECL_CONSTEXPR inline uint qPopulationCount(long unsigned int v) ...@@ -582,7 +584,7 @@ Q_DECL_CONSTEXPR inline uint qPopulationCount(long unsigned int v)
#undef QALGORITHMS_USE_BUILTIN_POPCOUNT #undef QALGORITHMS_USE_BUILTIN_POPCOUNT
#endif #endif
QT_WARNING_POP
QT_END_NAMESPACE QT_END_NAMESPACE
#endif // QALGORITHMS_H #endif // QALGORITHMS_H
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment