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

Utils: Compile with QT_NO_CAST_FROM_ASCII.

Browse Source 
Change-Id: I5cd5607fcd3311915217a1615b948587ef808cfa
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Friedemann Kleint
2012-01-04 17:34:08 +01:00
parent 5a31b0067d
commit ac54974b32
20 changed files with 48 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/utils/buildablehelperlibrary.cpp
View File

@@ -72,7 +72,7 @@ QString BuildableHelperLibrary::qtInstallDataDir(const Utils::FileName &qmakePat
QProcess proc;
proc.start(qmakePath.toString(), QStringList() << QLatin1String("-query") << QLatin1String("QT_INSTALL_DATA"));
if (proc.waitForFinished())
return QString(proc.readAll().trimmed());
return QString::fromLocal8Bit(proc.readAll()).trimmed();
return QString();
}
@@ -276,7 +276,7 @@ bool BuildableHelperLibrary::buildHelper(const BuildHelperArguments &arguments,
log->append(newline);
log->append(QCoreApplication::translate("ProjectExplorer::BuildableHelperLibrary",
"Running %1 %2 ...\n").arg(arguments.qmakeCommand.toUserOutput(),
qmakeArgs.join(" ")));
qmakeArgs.join(QLatin1String(" "))));
if (!runBuildProcess(proc, arguments.qmakeCommand.toString(), qmakeArgs, 30000, false, log, errorMessage))
return false;
@@ -287,7 +287,7 @@ bool BuildableHelperLibrary::buildHelper(const BuildHelperArguments &arguments,
return false;
}
log->append(QCoreApplication::translate("ProjectExplorer::BuildableHelperLibrary",
"Running %1 %2 ...\n").arg(makeFullPath, arguments.makeArguments.join(" ")));
"Running %1 %2 ...\n").arg(makeFullPath, arguments.makeArguments.join(QLatin1String(" "))));
if (!runBuildProcess(proc, makeFullPath, arguments.makeArguments, 120000, false, log, errorMessage))
return false;
return true;