feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QML-Debugger: Compile with QT_NO_CAST_FROM_ASCII.

Browse Source 
Change-Id: Id6f437c54504f6730c8726264f460b8f1631899d
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Friedemann Kleint
2011-12-21 13:29:31 +01:00
committed by hjk
parent 9e5dc72bb9
commit ec49390052
4 changed files with 73 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/debugger/qml/qmlengine.cpp
View File

@@ -271,7 +271,7 @@ void QmlEngine::retryMessageBoxFinished(int result)
}
case QMessageBox::Help: {
Core::HelpManager *helpManager = Core::HelpManager::instance();
helpManager->handleHelpRequest("qthelp://com.nokia.qtcreator/doc/creator-debugging-qml.html");
helpManager->handleHelpRequest(QLatin1String("qthelp://com.nokia.qtcreator/doc/creator-debugging-qml.html"));
// fall through
}
default:
@@ -830,17 +830,13 @@ void QmlEngine::executeDebuggerCommand(const QString& command)
QString QmlEngine::qmlImportPath() const
{
return startParameters().environment.value("QML_IMPORT_PATH");
return startParameters().environment.value(QLatin1String("QML_IMPORT_PATH"));
}
void QmlEngine::logMessage(const QString &service, LogDirection direction, const QString &message)
{
QString msg = service;
if (direction == LogSend) {
msg += ": sending ";
} else {
msg += ": receiving ";
}
msg += direction == LogSend ? QLatin1String(": sending ") : QLatin1String(": receiving ");
msg += message;
showMessage(msg, LogDebug);
}