From 4cf5ffc2a69ab688bfd5377dfe9dd09a3ae00a4b Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 28 Jun 2012 11:32:35 +0200 Subject: [PATCH] QMetaType: Fix warnings about truncation from uint64 to int. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Triggers warnings with MSVC2010/64bit. Change-Id: I90abdf4de416e0db554eb46e4b3cc7a0a38cb1db Reviewed-by: Jędrzej Nowacki --- src/corelib/kernel/qmetatype.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index 1a57cac7f1..fa0726adfa 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -739,11 +739,11 @@ struct QMetaTypeId< SINGLE_ARG_TEMPLATE > \ static QBasicAtomicInt metatype_id = Q_BASIC_ATOMIC_INITIALIZER(0); \ if (!metatype_id.load()) { \ QVarLengthArray name; \ - name.append(#SINGLE_ARG_TEMPLATE, sizeof(#SINGLE_ARG_TEMPLATE) - 1); \ + name.append(#SINGLE_ARG_TEMPLATE, int(sizeof(#SINGLE_ARG_TEMPLATE)) - 1); \ name.append('<'); \ const char *tName = QMetaType::typeName(qMetaTypeId()); \ Q_ASSERT(tName); \ - name.append(tName, strlen(tName)); \ + name.append(tName, int(strlen(tName))); \ if (name.last() == '>') \ name.append(' '); \ name.append('>'); \