From cce5162ad3b6504f373ad31b6adf7a1d21367181 Mon Sep 17 00:00:00 2001
From: jasplin <qt-info@nokia.com>
Date: Tue, 26 Apr 2011 12:37:50 +0200
Subject: Cleaned up benchmark project files.

Reviewed-by: Sergio Ahumada
---
 tests/benchmarks/corelib/io/qdir/qdir.pro | 4 +++-
 tests/benchmarks/script/script.pro        | 3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/benchmarks/corelib/io/qdir/qdir.pro b/tests/benchmarks/corelib/io/qdir/qdir.pro
index c572566..2c18e75 100644
--- a/tests/benchmarks/corelib/io/qdir/qdir.pro
+++ b/tests/benchmarks/corelib/io/qdir/qdir.pro
@@ -1,2 +1,4 @@
 TEMPLATE = subdirs
-SUBDIRS  = 10000
+SUBDIRS  = \
+         10000 \
+         tree
diff --git a/tests/benchmarks/script/script.pro b/tests/benchmarks/script/script.pro
index 80278d0..5da05e7 100644
--- a/tests/benchmarks/script/script.pro
+++ b/tests/benchmarks/script/script.pro
@@ -14,7 +14,6 @@ TRUSTED_BENCHMARKS += \
     qscriptclass \
     qscriptvalue \
     qscriptengine \
-    qscriptobject \
-    context2d
+    qscriptqobject
 
 include(../trusted-benchmarks.pri)
-- 
cgit v0.12


From 940f16babab76b328b7c9bfdb5435102c689b76b Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Tue, 26 Apr 2011 15:28:34 +0200
Subject: Fix warnings on unused parameters and variables

---
 src/network/access/qhttpnetworkconnection.cpp | 1 -
 src/network/kernel/qhostinfo.cpp              | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
index 83156c6..07dd729 100644
--- a/src/network/access/qhttpnetworkconnection.cpp
+++ b/src/network/access/qhttpnetworkconnection.cpp
@@ -117,7 +117,6 @@ QHttpNetworkConnectionPrivate::~QHttpNetworkConnectionPrivate()
 
 void QHttpNetworkConnectionPrivate::init()
 {
-    Q_Q(QHttpNetworkConnection);
     for (int i = 0; i < channelCount; i++) {
         channels[i].setConnection(this->q_func());
         channels[i].ssl = encrypt;
diff --git a/src/network/kernel/qhostinfo.cpp b/src/network/kernel/qhostinfo.cpp
index a16d4ca..c86f510 100644
--- a/src/network/kernel/qhostinfo.cpp
+++ b/src/network/kernel/qhostinfo.cpp
@@ -288,7 +288,7 @@ QHostInfo QHostInfoPrivate::fromName(const QString &name, QSharedPointer<QNetwor
 
 #ifndef Q_OS_SYMBIAN
 // This function has a special implementation for symbian right now in qhostinfo_symbian.cpp but not on other OS.
-QHostInfo QHostInfoAgent::fromName(const QString &hostName, QSharedPointer<QNetworkSession> networkSession)
+QHostInfo QHostInfoAgent::fromName(const QString &hostName, QSharedPointer<QNetworkSession>)
 {
     return QHostInfoAgent::fromName(hostName);
 }
-- 
cgit v0.12


From 4671c273edb87e55436dd3bf0b371267c5e34ff7 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Tue, 26 Apr 2011 15:50:49 +0200
Subject: Fix warning about ASCII cast in calling QString::contains

---
 src/declarative/debugger/qdeclarativedebugserver.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/declarative/debugger/qdeclarativedebugserver.cpp b/src/declarative/debugger/qdeclarativedebugserver.cpp
index 6f46354..c7bdcb6 100644
--- a/src/declarative/debugger/qdeclarativedebugserver.cpp
+++ b/src/declarative/debugger/qdeclarativedebugserver.cpp
@@ -184,7 +184,7 @@ QDeclarativeDebugServer *QDeclarativeDebugServer::instance()
                 int separatorIndex = appD->qmljsDebugArgumentsString().indexOf(QLatin1Char(','));
                 port = appD->qmljsDebugArgumentsString().mid(5, separatorIndex - 5).toInt(&ok);
                 pluginName = QLatin1String("qmldbg_tcp");
-            } else if (appD->qmljsDebugArgumentsString().contains("ost")) {
+            } else if (appD->qmljsDebugArgumentsString().contains(QLatin1String("ost"))) {
                 pluginName = QLatin1String("qmldbg_ost");
                 ok = true;
             }
-- 
cgit v0.12