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

QmlProjectManager: Compile with QT_NO_CAST_FROM_ASCII

Browse Source 
Change-Id: Icac2d84abc001c963d78aa9e95911110463b4b04
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
This commit is contained in:
Orgad Shaneh
2012-11-26 21:24:16 +02:00
committed by Kai Koehne
parent b562f8175a
commit a24c1407a3
10 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
View File

@@ -104,7 +104,7 @@ bool QmlProjectRunControl::isRunning() const
QIcon QmlProjectRunControl::icon() const
{
return QIcon(ProjectExplorer::Constants::ICON_RUN_SMALL);
return QIcon(QLatin1String(ProjectExplorer::Constants::ICON_RUN_SMALL));
}
void QmlProjectRunControl::slotBringApplicationToForeground(qint64 pid)
@@ -200,9 +200,9 @@ RunControl *QmlProjectRunControlFactory::createDebugRunControl(QmlProjectRunConf
Debugger::DebuggerStartParameters params;
params.startMode = Debugger::StartInternal;
params.executable = runConfig->observerPath();
params.qmlServerAddress = "127.0.0.1";
params.qmlServerAddress = QLatin1String("127.0.0.1");
params.qmlServerPort = runConfig->debuggerAspect()->qmlDebugServerPort();
params.processArgs = QString("-qmljsdebugger=port:%1,block").arg(params.qmlServerPort);
params.processArgs = QString::fromLatin1("-qmljsdebugger=port:%1,block").arg(params.qmlServerPort);
params.processArgs += QLatin1Char(' ') + runConfig->viewerArguments();
params.workingDirectory = runConfig->workingDirectory();
params.environment = runConfig->environment();
@@ -223,7 +223,7 @@ RunControl *QmlProjectRunControlFactory::createDebugRunControl(QmlProjectRunConf
if (params.executable.isEmpty()) {
QmlProjectPlugin::showQmlObserverToolWarning();
*errorMessage = QString(""); // hack, we already showed a error message
errorMessage->clear(); // hack, we already showed a error message
return 0;
}