diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-27 09:17:03 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-27 09:17:03 (GMT) |
| commit | afc4dedd762e49be49455398c960d7d2e5a36ed3 (patch) | |
| tree | e94750d85579ac3ecdaae7f170de1e6caa683294 | |
| parent | 7a73de74fc517ff5722289cce4e4e754ff2417be (diff) | |
| parent | 4671c273edb87e55436dd3bf0b371267c5e34ff7 (diff) | |
| download | Qt-afc4dedd762e49be49455398c960d7d2e5a36ed3.zip Qt-afc4dedd762e49be49455398c960d7d2e5a36ed3.tar.gz Qt-afc4dedd762e49be49455398c960d7d2e5a36ed3.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix warning about ASCII cast in calling QString::contains
Fix warnings on unused parameters and variables
Cleaned up benchmark project files.
| -rw-r--r-- | src/declarative/debugger/qdeclarativedebugserver.cpp | 2 | ||||
| -rw-r--r-- | src/network/access/qhttpnetworkconnection.cpp | 1 | ||||
| -rw-r--r-- | src/network/kernel/qhostinfo.cpp | 2 | ||||
| -rw-r--r-- | tests/benchmarks/corelib/io/qdir/qdir.pro | 4 | ||||
| -rw-r--r-- | tests/benchmarks/script/script.pro | 3 |
5 files changed, 6 insertions, 6 deletions
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; } 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); } 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) |