From 2b8f7c9b15ca4b8d50fa7dc9d431b1e4d1e8bbe9 Mon Sep 17 00:00:00 2001
From: Andreas Buhr <andreas.buhr@qt.io>
Date: Tue, 30 Mar 2021 10:50:41 +0200
Subject: [PATCH] Fix some warnings

Change-Id: Ief00228f83e16421fb4eec4c678632d5c996624f
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
---
 tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp  | 6 ++++--
 tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
index 2883a478528..4e5eb430a2a 100644
--- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
+++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
@@ -4643,7 +4643,8 @@ template<typename Enum> void testVariant(Enum value, bool *ok)
     QVERIFY(var2.convert(QMetaType::Int));
     QCOMPARE(var2.value<int>(), static_cast<int>(value));
 
-    if ((static_cast<qint64>(value) <= INT_MAX) && (static_cast<qint64>(value) >= INT_MIN)) {
+    // unary + to silence gcc warning
+    if ((+static_cast<qint64>(value) <= INT_MAX) && (+static_cast<qint64>(value) >= INT_MIN)) {
         int intValue = static_cast<int>(value);
         QVariant intVar = intValue;
         QVERIFY(intVar.canConvert<Enum>());
@@ -4702,7 +4703,8 @@ template<typename Enum> void testVariantMeta(Enum value, bool *ok, const char *s
 
     QVariant strVar = QString::fromLatin1(string);
     QVERIFY(strVar.canConvert<Enum>());
-    if ((static_cast<qint64>(value) > INT_MAX) || (static_cast<qint64>(value) < INT_MIN)) {
+    // unary + to silence gcc warning
+    if ((+static_cast<qint64>(value) > INT_MAX) || (+static_cast<qint64>(value) < INT_MIN)) {
         QEXPECT_FAIL("", "QMetaEnum api uses 'int' as return type  QTBUG-27451", Abort);
         *ok = true;
     }
diff --git a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
index 0e6689b413c..bac7962c6a9 100644
--- a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
+++ b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
@@ -1356,7 +1356,8 @@ void tst_QMenuBar::menubarSizeHint()
     {
         MyStyle() : QProxyStyle(QStyleFactory::create("windows")) { }
 
-        virtual int pixelMetric(PixelMetric metric, const QStyleOption * option = 0, const QWidget * widget = 0 ) const
+        int pixelMetric(PixelMetric metric, const QStyleOption *option = 0,
+                        const QWidget *widget = 0) const override
         {
             // I chose strange values (prime numbers to be more sure that the size of the menubar is correct)
             switch (metric)