diff options
| -rw-r--r-- | mkspecs/features/qt_module_headers.prf | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qtestsupport_core.h | 4 | ||||
| -rw-r--r-- | src/corelib/text/qstringbuilder.h | 2 | ||||
| -rw-r--r-- | src/corelib/tools/qvector.h | 4 | ||||
| -rw-r--r-- | src/testlib/qtest.h | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/mkspecs/features/qt_module_headers.prf b/mkspecs/features/qt_module_headers.prf index 0c8e4ff2a6..bd3d694195 100644 --- a/mkspecs/features/qt_module_headers.prf +++ b/mkspecs/features/qt_module_headers.prf @@ -230,7 +230,7 @@ headersclean:!internal_module { hcleanFLAGS += -Wcast-align clang_ver = $${QT_CLANG_MAJOR_VERSION}.$${QT_CLANG_MINOR_VERSION} - versionAtLeast(clang_ver, 3.8): hcleanFLAGS += -Wdouble-promotion + versionAtLeast(clang_ver, 3.8): hcleanFLAGS += -Wdouble-promotion -Wshorten-64-to-32 !clang { # options accepted only by GCC diff --git a/src/corelib/kernel/qtestsupport_core.h b/src/corelib/kernel/qtestsupport_core.h index c8209b5ae4..24399dd7a9 100644 --- a/src/corelib/kernel/qtestsupport_core.h +++ b/src/corelib/kernel/qtestsupport_core.h @@ -76,14 +76,14 @@ Q_REQUIRED_RESULT static bool qWaitFor(Functor predicate, int timeout = 5000) QCoreApplication::processEvents(QEventLoop::AllEvents); QCoreApplication::sendPostedEvents(nullptr, QEvent::DeferredDelete); - remaining = deadline.remainingTime(); + remaining = int(deadline.remainingTime()); if (remaining > 0) QTestPrivate::qSleep(qMin(10, remaining)); if (predicate()) return true; - remaining = deadline.remainingTime(); + remaining = int(deadline.remainingTime()); } while (remaining > 0); return predicate(); // Last chance diff --git a/src/corelib/text/qstringbuilder.h b/src/corelib/text/qstringbuilder.h index ae17dad9ac..6ba01c0e30 100644 --- a/src/corelib/text/qstringbuilder.h +++ b/src/corelib/text/qstringbuilder.h @@ -120,7 +120,7 @@ private: if (!QConcatenable< QStringBuilder<A, B> >::ExactSize && int(len) != d - start) { // this resize is necessary since we allocate a bit too much // when dealing with variable sized 8-bit encodings - s.resize(d - start); + s.resize(int(d - start)); } return s; } diff --git a/src/corelib/tools/qvector.h b/src/corelib/tools/qvector.h index f973907714..88c942ca15 100644 --- a/src/corelib/tools/qvector.h +++ b/src/corelib/tools/qvector.h @@ -671,7 +671,7 @@ int indexOf(const QVector<T> &vector, const U &u, int from) auto e = vector.end(); while (++n != e) if (*n == u) - return n - vector.begin(); + return int(n - vector.begin()); } return -1; } @@ -688,7 +688,7 @@ int lastIndexOf(const QVector<T> &vector, const U &u, int from) auto n = vector.begin() + from + 1; while (n != b) { if (*--n == u) - return n - b; + return int(n - b); } } return -1; diff --git a/src/testlib/qtest.h b/src/testlib/qtest.h index 0298ff96e3..18175196ff 100644 --- a/src/testlib/qtest.h +++ b/src/testlib/qtest.h @@ -97,7 +97,7 @@ template<> inline char *toString(const QBitArray &ba) qsizetype size = ba.size(); char *str = new char[size + 1]; for (qsizetype i = 0; i < size; ++i) - str[i] = "01"[ba.testBit(i)]; + str[i] = "01"[ba.testBit(int(i))]; str[size] = '\0'; return str; } |