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

debugger: unify naming of sysroot related variables and function

Browse Source 
Change-Id: I77dd74ba7260622d9fec6cfca4a06d0f817495d8
Reviewed-on: http://codereview.qt.nokia.com/212
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2011-05-30 12:56:26 +02:00
committed by hjk
parent ef19691309
commit 2761e8da5a
8 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/remotelinux/maemoinstalltosysrootstep.cpp
View File

@@ -312,7 +312,7 @@ void MaemoCopyToSysrootStep::run(QFutureInterface<bool> &fi)
}
emit addOutput(tr("Copying files to sysroot ..."), MessageOutput);
QDir sysRootDir(tc->sysroot());
QDir sysrootDir(tc->sysroot());
const QSharedPointer<MaemoDeployables> deployables
= qobject_cast<Qt4MaemoDeployConfiguration *>(deployConfiguration())->deployables();
const QChar sep = QLatin1Char('/');
@@ -321,7 +321,7 @@ void MaemoCopyToSysrootStep::run(QFutureInterface<bool> &fi)
const QFileInfo localFileInfo(deployable.localFilePath);
const QString targetFilePath = tc->sysroot() + sep
+ deployable.remoteDir + sep + localFileInfo.fileName();
sysRootDir.mkpath(deployable.remoteDir.mid(1));
sysrootDir.mkpath(deployable.remoteDir.mid(1));
QString errorMsg;
MaemoGlobal::removeRecursively(targetFilePath, errorMsg);
if (!MaemoGlobal::copyRecursively(deployable.localFilePath,