summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/core')
-rw-r--r--src/core/aspects/qabstractaspect.cpp2
-rw-r--r--src/core/qchangearbiter.cpp2
-rw-r--r--src/core/resources/qframeallocator.cpp4
3 files changed, 4 insertions, 4 deletions
diff --git a/src/core/aspects/qabstractaspect.cpp b/src/core/aspects/qabstractaspect.cpp
index 82a1065f9..05842ffa5 100644
--- a/src/core/aspects/qabstractaspect.cpp
+++ b/src/core/aspects/qabstractaspect.cpp
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
static QByteArray className(const QMetaObject &obj)
{
// note: class names are stored in static meta objects, thus the usage of fromRawData here is fine
- return QByteArray::fromRawData(obj.className(), strlen(obj.className()));
+ return QByteArray::fromRawData(obj.className(), int(strlen(obj.className())));
}
namespace Qt3D {
diff --git a/src/core/qchangearbiter.cpp b/src/core/qchangearbiter.cpp
index 1d111d642..c42223a20 100644
--- a/src/core/qchangearbiter.cpp
+++ b/src/core/qchangearbiter.cpp
@@ -105,7 +105,7 @@ void QChangeArbiter::initialize(QAbstractAspectJobManager *jobManager)
void QChangeArbiter::distributeQueueChanges(QChangeQueue *changeQueue)
{
- for (int i = 0, n = changeQueue->size(); i < n; i++) {
+ for (int i = 0, n = int(changeQueue->size()); i < n; i++) {
QSceneChangePtr& change = (*changeQueue)[i];
// Lookup which observers care about the subject this change came from
// and distribute the change to them
diff --git a/src/core/resources/qframeallocator.cpp b/src/core/resources/qframeallocator.cpp
index cfa49c0cf..48f0e5bbc 100644
--- a/src/core/resources/qframeallocator.cpp
+++ b/src/core/resources/qframeallocator.cpp
@@ -273,7 +273,7 @@ void* QFrameAllocator::allocateRawMemory(size_t size)
{
Q_D(QFrameAllocator);
Q_ASSERT(size <= d->m_maxObjectSize);
- uint allocatorIndex = d->allocatorIndexFromSize(size);
+ uint allocatorIndex = d->allocatorIndexFromSize(uint(size));
return d->allocateAtChunk(allocatorIndex);
}
@@ -281,7 +281,7 @@ void QFrameAllocator::deallocateRawMemory(void* ptr, size_t size)
{
Q_D(QFrameAllocator);
Q_ASSERT(size <= d->m_maxObjectSize);
- uint allocatorIndex = d->allocatorIndexFromSize(size);
+ uint allocatorIndex = d->allocatorIndexFromSize(uint(size));
d->deallocateAtChunck(ptr, allocatorIndex);
}