aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
diff options
context:
space:
mode:
authorOrgad Shaneh <[email protected]>2012-11-26 21:18:13 +0200
committerOrgad Shaneh <[email protected]>2012-11-27 10:40:47 +0100
commitf739c85c720c917698621664dd537b6863d07a49 (patch)
tree2e6b94ff003540655822db7ee3c9e4beb04054e7 /src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
parentdba973c9331a5ba6c4d534d2a4876e683a6db39e (diff)
QmlProfiler: Compile with QT_NO_CAST_FROM_ASCII
Change-Id: I99c96e723e80ec318acd9300b4f44e7c3ce37485 Reviewed-by: Friedemann Kleint <[email protected]> Reviewed-by: Christiaan Janssen <[email protected]>
Diffstat (limited to 'src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp')
-rw-r--r--src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp b/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
index 68d02cd636a..a37443d76f4 100644
--- a/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
@@ -75,7 +75,7 @@ public:
QmlProfilerClientManager::QmlProfilerClientManager(QObject *parent) :
QObject(parent), d(new QmlProfilerClientManagerPrivate(this))
{
- setObjectName("QML Profiler Connections");
+ setObjectName(QLatin1String("QML Profiler Connections"));
d->profilerState = 0;
@@ -224,7 +224,8 @@ void QmlProfilerClientManager::connectToClient()
if (!d->connection || d->connection->state() != QAbstractSocket::UnconnectedState)
return;
- QmlProfilerTool::logStatus(QString("QML Profiler: Connecting to %1:%2 ...").arg(d->tcpHost, QString::number(d->tcpPort)));
+ QmlProfilerTool::logStatus(QString::fromLatin1("QML Profiler: Connecting to %1:%2 ...")
+ .arg(d->tcpHost, QString::number(d->tcpPort)));
d->connection->connectToHost(d->tcpHost, d->tcpPort);
}
@@ -321,14 +322,14 @@ void QmlProfilerClientManager::retryMessageBoxFinished(int result)
break;
}
case QMessageBox::Help: {
- QmlProfilerTool::handleHelpRequest(QString("qthelp://com.nokia.qtcreator/doc/creator-debugging-qml.html"));
+ QmlProfilerTool::handleHelpRequest(QLatin1String("qthelp://com.nokia.qtcreator/doc/creator-debugging-qml.html"));
// fall through
}
default: {
if (d->connection) {
- QmlProfilerTool::logStatus("QML Profiler: Failed to connect! " + d->connection->errorString());
+ QmlProfilerTool::logStatus(QLatin1String("QML Profiler: Failed to connect! ") + d->connection->errorString());
} else {
- QmlProfilerTool::logStatus("QML Profiler: Failed to connect!");
+ QmlProfilerTool::logStatus(QLatin1String("QML Profiler: Failed to connect!"));
}
emit connectionFailed();