From 965c50e5aa7154fd344c2f44b87f9125f11d32bf Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 17 Jul 2019 23:59:59 +0000 Subject: [PATCH] compiler warning fixes Signed-off-by: Ivailo Monev --- .../script/qscriptvalueiterator/tst_qscriptvalueiterator.cpp | 5 ++--- util/gencmap/gencmap.cpp | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/benchmarks/script/qscriptvalueiterator/tst_qscriptvalueiterator.cpp b/tests/benchmarks/script/qscriptvalueiterator/tst_qscriptvalueiterator.cpp index c3b674e6f..8bf210341 100644 --- a/tests/benchmarks/script/qscriptvalueiterator/tst_qscriptvalueiterator.cpp +++ b/tests/benchmarks/script/qscriptvalueiterator/tst_qscriptvalueiterator.cpp @@ -232,9 +232,8 @@ void tst_QScriptValueIterator::flags() { QScriptEngine engine; QScriptValue object = engine.newObject(); - QScriptValue::PropertyFlags flags = flags; - object.setProperty(QLatin1String("foo"), 123, - QScriptValue::SkipInEnumeration | QScriptValue::ReadOnly | QScriptValue::Undeletable); + QScriptValue::PropertyFlags flags = QScriptValue::SkipInEnumeration | QScriptValue::ReadOnly | QScriptValue::Undeletable; + object.setProperty(QLatin1String("foo"), 123, flags); QScriptValueIterator it(object); it.next(); QBENCHMARK { diff --git a/util/gencmap/gencmap.cpp b/util/gencmap/gencmap.cpp index f0be1da82..11c33543e 100644 --- a/util/gencmap/gencmap.cpp +++ b/util/gencmap/gencmap.cpp @@ -287,7 +287,8 @@ static int apple_cmap[216] = { int findapple(Col c) { for (int i=0; i<216; i++) - if (apple_cmap[i]==(c.r<<16)|(c.g<<8)|c.b) return i; + if (apple_cmap[i]==((c.r<<16)|(c.g<<8)|c.b)) + return i; abort(); } #endif