summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Koller <kollix@aon.at>2020-03-07 21:57:57 +0100
committerMartin Koller <kollix@aon.at>2020-04-11 09:42:37 +0100
commitce672e1c9b1d6272ff8ce6fc626f61f7f3adce06 (patch)
tree5d3575b8ae70d5b9b019f18a5ef223dd4df1c6fd /src
parent033d01bd6e2aef740ad1408a04d3ca0ae3b9ba9b (diff)
avoid compile warning when using clang++ with -Wshorten-64-to-32
Change-Id: I78a6cd84ac5b8c250d9569d864a7e38269b85e10 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/kernel/qtestsupport_core.h4
-rw-r--r--src/corelib/text/qstringbuilder.h2
-rw-r--r--src/corelib/tools/qvector.h4
-rw-r--r--src/testlib/qtest.h2
4 files changed, 6 insertions, 6 deletions
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;
}