From: Thiago Macieira <thiago.macieira@intel.com>
Date: Thu, 20 Oct 2011 19:22:58 +0000 (+0200)
Subject: Silence warning with ICC about change of signal in integer conversion
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=52b16a50de200d1af5b60352f7a783bc349c7d0a;p=konrad%2Fqtdeclarative.git

Silence warning with ICC about change of signal in integer conversion

Change-Id: I7a9bc7de580dd37005d842d0ff5a000ba16f7c20
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
---

diff --git a/src/qml/qml/v8/qv8qobjectwrapper.cpp b/src/qml/qml/v8/qv8qobjectwrapper.cpp
index 708f5f4..480c9f9 100644
--- a/src/qml/qml/v8/qv8qobjectwrapper.cpp
+++ b/src/qml/qml/v8/qv8qobjectwrapper.cpp
@@ -300,8 +300,8 @@ static v8::Handle<v8::Value> GenericValueGetter(v8::Local<v8::String>, const v8:
 #define FAST_GETTER_FUNCTION(property, cpptype) \
     (property->hasAccessors()?((v8::AccessorGetter)GenericValueGetter<cpptype, &ReadAccessor::Accessor>):(property->isDirect()?((v8::AccessorGetter)GenericValueGetter<cpptype, &ReadAccessor::Direct>):((v8::AccessorGetter)GenericValueGetter<cpptype, &ReadAccessor::Indirect>)))
 
-static quint32 toStringHash = -1;
-static quint32 destroyHash = -1;
+static quint32 toStringHash = quint32(-1);
+static quint32 destroyHash = quint32(-1);
 
 void QV8QObjectWrapper::init(QV8Engine *engine)
 {
diff --git a/src/quick/items/qquickspriteengine.cpp b/src/quick/items/qquickspriteengine.cpp
index 900cb84..8904a83 100644
--- a/src/quick/items/qquickspriteengine.cpp
+++ b/src/quick/items/qquickspriteengine.cpp
@@ -621,7 +621,7 @@ uint QQuickStochasticEngine::updateSprites(uint time)//### would returning a lis
     m_advanceTime.start();
     m_addAdvance = true;
     if (m_stateUpdates.isEmpty())
-        return -1;
+        return uint(-1);
     return m_stateUpdates.first().first;
 }