Move QT_WARNING_DISABLE inside Qt namespace.

src/libs/qmuparser/text.h

@@ -32,13 +32,25 @@
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
 #include <QTextStream>
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
+#include "qmudef.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
+
 namespace Qt
 {
-//static auto endl = ::endl;
+QT_WARNING_PUSH
-//static auto flush = ::flush;
+QT_WARNING_DISABLE_GCC("-Wunused-variable")
-static auto dec = ::dec;
+QT_WARNING_DISABLE_CLANG("-Wunused-variable")
-//static auto SkipEmptyParts = QString::SkipEmptyParts;
+
-}
+//static auto endl = ::endl; // NOLINT
+//static auto flush = ::flush; // NOLINT
+static auto dec = ::dec; // NOLINT
+//static auto SkipEmptyParts = QString::SkipEmptyParts; // NOLINT
+
+QT_WARNING_POP
+}  // namespace Qt
+
 #endif
 
 #endif // TEXT_H

src/libs/vmisc/backport/text.h

@@ -29,16 +29,28 @@
 #define TEXT_H
 
 #include <QtGlobal>
-#include <QString>
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
+#include <QTextStream>
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
+#include "../vmisc/diagnostic.h"
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
+
 namespace Qt
 {
-static auto endl = ::endl;
+QT_WARNING_PUSH
-static auto flush = ::flush;
+QT_WARNING_DISABLE_GCC("-Wunused-variable")
-static auto dec = ::dec;
+QT_WARNING_DISABLE_CLANG("-Wunused-variable")
-static auto SkipEmptyParts = QString::SkipEmptyParts;
+
-}
+static auto endl = ::endl; // NOLINT
+static auto flush = ::flush; // NOLINT
+static auto dec = ::dec; // NOLINT
+static auto SkipEmptyParts = QString::SkipEmptyParts; // NOLINT
+
+QT_WARNING_POP
+}  // namespace Qt
+
 #endif
 
 #endif // TEXT_H