Commit a20e6982 authored by Friedemann Kleint's avatar Friedemann Kleint
Browse files

QNX: Fix compilation with Qt 4.



Change-Id: I2a3aadeaebca04ebacc7f199fb953098113c92b8
Reviewed-by: default avatarFriedemann Kleint <Friedemann.Kleint@digia.com>
parent 9c17e9cb
...@@ -323,7 +323,7 @@ void BlackBerryApplicationRunner::checkQmlJsDebugArguments() ...@@ -323,7 +323,7 @@ void BlackBerryApplicationRunner::checkQmlJsDebugArguments()
QStringList args; QStringList args;
args << QLatin1String("-listManifest") << QDir::toNativeSeparators(m_barPackage); args << QLatin1String("-listManifest") << QDir::toNativeSeparators(m_barPackage);
if (debugCheckQmlJSArgs) if (debugCheckQmlJSArgs)
qDebug() << "get manifest:" << nativePackagerCmd << args.join(QLatin1Char(' ')); qDebug() << "get manifest:" << nativePackagerCmd << args.join(QLatin1String(" "));
m_checkQmlJsDebugArgumentsProcess->start(nativePackagerCmd, args); m_checkQmlJsDebugArgumentsProcess->start(nativePackagerCmd, args);
} }
...@@ -383,7 +383,7 @@ void BlackBerryApplicationRunner::checkQmlJsDebugArgumentsManifestLoaded() ...@@ -383,7 +383,7 @@ void BlackBerryApplicationRunner::checkQmlJsDebugArgumentsManifestLoaded()
args << manifestFile->fileName(); args << manifestFile->fileName();
args << QLatin1String("app/META-INF/MANIFEST.MF"); args << QLatin1String("app/META-INF/MANIFEST.MF");
if (debugCheckQmlJSArgs) if (debugCheckQmlJSArgs)
qDebug() << "set manifest:" << m_deployCmd << args.join(QLatin1Char(' ')); qDebug() << "set manifest:" << m_deployCmd << args.join(QLatin1String(" "));
m_checkQmlJsDebugArgumentsProcess->start(m_deployCmd, args); m_checkQmlJsDebugArgumentsProcess->start(m_deployCmd, args);
} }
...@@ -427,7 +427,7 @@ void BlackBerryApplicationRunner::launchApplication() ...@@ -427,7 +427,7 @@ void BlackBerryApplicationRunner::launchApplication()
m_launchProcess->setEnvironment(m_environment.toStringList()); m_launchProcess->setEnvironment(m_environment.toStringList());
} }
if (debugCheckQmlJSArgs) if (debugCheckQmlJSArgs)
qDebug() << "launch:" << m_deployCmd << args.join(QLatin1Char(' ')); qDebug() << "launch:" << m_deployCmd << args.join(QLatin1String(" "));
m_launchProcess->start(m_deployCmd, args); m_launchProcess->start(m_deployCmd, args);
m_runningStateTimer->start(); m_runningStateTimer->start();
m_running = true; m_running = true;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment