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

Maemo: Fix sysroot copying.

Browse Source
This commit is contained in:
Christian Kandeler
2010-08-26 13:17:40 +02:00
parent c060588b15
commit 191df5b189
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
View File

@@ -519,9 +519,9 @@ void MaemoDeployStep::installToSysroot()
const QLatin1Char sep('/');
const QString targetFilePath = toolChain()->sysrootRoot() + sep
+ d.remoteDir + sep + QFileInfo(d.localFilePath).fileName();
if (!sysRootDir.mkpath(d.remoteDir.mid(1))
|| !QFile::remove(targetFilePath)
|| !QFile::copy(d.localFilePath, targetFilePath)) {
sysRootDir.mkpath(d.remoteDir.mid(1));
QFile::remove(targetFilePath);
if (!QFile::copy(d.localFilePath, targetFilePath)) {
writeOutput(tr("Sysroot installation failed: "
"Could not copy '%1' to '%2'. Continuing anyway.")
.arg(QDir::toNativeSeparators(d.localFilePath),