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 /src/declarative | |
| 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.
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/debugger/qdeclarativedebugserver.cpp | 2 |
1 files changed, 1 insertions, 1 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; } |