aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@nokia.com>2011-11-08 13:47:50 +0100
committerQt by Nokia <qt-info@nokia.com>2011-11-09 09:55:01 +0100
commitf59b4c4539f022f675016381866b9666cf9271f2 (patch)
tree6a712aa8b98c3bff8a481f55cee414da59836026 /src
parent19cdd020abc9effb50b4251fa688e32420b55d30 (diff)
Fix gcc compilation warnings
QML_SHOW_FRAMERATE is a leftover from QDeclarativeView. Rest is signed vs unsigned integer comparison. Change-Id: Ie17e217fc1cf13d29a3795a40dbbc07e9c7c6067 Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/declarative/items/qquickview.cpp2
-rw-r--r--src/declarative/qml/qdeclarativesqldatabase.cpp2
-rw-r--r--src/declarative/qml/qdeclarativexmlhttprequest.cpp4
-rw-r--r--src/declarative/qml/v8/qv8listwrapper.cpp2
4 files changed, 4 insertions, 6 deletions
diff --git a/src/declarative/items/qquickview.cpp b/src/declarative/items/qquickview.cpp
index 80d3a896d2..bf01a895a6 100644
--- a/src/declarative/items/qquickview.cpp
+++ b/src/declarative/items/qquickview.cpp
@@ -56,8 +56,6 @@
QT_BEGIN_NAMESPACE
-DEFINE_BOOL_CONFIG_OPTION(frameRateDebug, QML_SHOW_FRAMERATE)
-
void QQuickViewPrivate::init()
{
Q_Q(QQuickView);
diff --git a/src/declarative/qml/qdeclarativesqldatabase.cpp b/src/declarative/qml/qdeclarativesqldatabase.cpp
index 920f835d19..80464fa8a3 100644
--- a/src/declarative/qml/qdeclarativesqldatabase.cpp
+++ b/src/declarative/qml/qdeclarativesqldatabase.cpp
@@ -217,7 +217,7 @@ static QString qmlsqldatabase_databaseFile(const QString& connectionName, QV8Eng
static v8::Handle<v8::Value> qmlsqldatabase_rows_index(QV8SqlDatabaseResource *r, uint32_t index)
{
- if (r->query.at() == index || r->query.seek(index)) {
+ if (r->query.at() == (int)index || r->query.seek(index)) {
QSqlRecord record = r->query.record();
// XXX optimize
diff --git a/src/declarative/qml/qdeclarativexmlhttprequest.cpp b/src/declarative/qml/qdeclarativexmlhttprequest.cpp
index 0009163036..e64088b754 100644
--- a/src/declarative/qml/qdeclarativexmlhttprequest.cpp
+++ b/src/declarative/qml/qdeclarativexmlhttprequest.cpp
@@ -820,7 +820,7 @@ v8::Handle<v8::Value> NamedNodeMap::indexed(uint32_t index, const v8::AccessorIn
if (!r || !r->list) return v8::Undefined();
QV8Engine *engine = V8ENGINE();
- if (index < r->list->count()) {
+ if ((int)index < r->list->count()) {
return Node::create(engine, r->list->at(index));
} else {
return v8::Undefined();
@@ -876,7 +876,7 @@ v8::Handle<v8::Value> NodeList::indexed(uint32_t index, const v8::AccessorInfo&
if (!r) return v8::Undefined();
QV8Engine *engine = V8ENGINE();
- if (index < r->d->children.count()) {
+ if ((int)index < r->d->children.count()) {
return Node::create(engine, r->d->children.at(index));
} else {
return v8::Undefined();
diff --git a/src/declarative/qml/v8/qv8listwrapper.cpp b/src/declarative/qml/v8/qv8listwrapper.cpp
index 9c1e3205af..aa0b82b3ad 100644
--- a/src/declarative/qml/v8/qv8listwrapper.cpp
+++ b/src/declarative/qml/v8/qv8listwrapper.cpp
@@ -185,7 +185,7 @@ v8::Handle<v8::Array> QV8ListWrapper::Enumerator(const v8::AccessorInfo &info)
v8::Local<v8::Array> rv = v8::Array::New(count);
- for (int ii = 0; ii < count; ++ii)
+ for (uint ii = 0; ii < count; ++ii)
rv->Set(ii, v8::Number::New(ii));
return rv;