diff options
| author | Qt CI Bot <qt_ci_bot@qt-project.org> | 2021-03-31 11:47:55 +0000 |
|---|---|---|
| committer | Qt CI Bot <qt_ci_bot@qt-project.org> | 2021-03-31 11:47:55 +0000 |
| commit | 293d556fb4f870929b5cbb04b99cc29bb7445cee (patch) | |
| tree | 13b3af2784fe416b9e3f6436ad1c6e8eeb48fac5 /tests/auto/corelib | |
| parent | f8fe3d812cbb3fe634aeacd8da0e2be01608162b (diff) | |
| parent | 2b8f7c9b15ca4b8d50fa7dc9d431b1e4d1e8bbe9 (diff) | |
Merge integration refs/builds/qtci/dev/1617183127
Diffstat (limited to 'tests/auto/corelib')
| -rw-r--r-- | tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp index 2883a47852..4e5eb430a2 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; } |