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

RemoteLinux: Don't do timestamp checks for file-by-file deployment.

Browse Source 
Rationale: If the device has been re-flashed, for example,
the deployment information will be outdated and every single file
will have to be touched to force re-deployment, which is a hassle
for the user and not very obvious either.

Change-Id: I9c48096eb4bdde4b13212f55c9c9a1bc6f9445fd
Reviewed-on: http://codereview.qt.nokia.com/2811
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
This commit is contained in:
Christian Kandeler
2011-08-10 09:02:05 +02:00
parent 32813776cc
commit 7144194425
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/remotelinux/genericdirectuploadservice.cpp
View File

@@ -259,13 +259,15 @@ void GenericDirectUploadService::stopDeployment()
handleDeploymentDone();
}
// Note: time stamp checks disabled for now; it's too much hassle for the user to force
// deployment in case the device has changed.
void GenericDirectUploadService::checkDeploymentNeeded(const DeployableFile &deployable) const
{
QFileInfo fileInfo(deployable.localFilePath);
if (fileInfo.isDir()) {
const QStringList files = QDir(deployable.localFilePath)
.entryList(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot);
if (files.isEmpty() && hasChangedSinceLastDeployment(deployable))
if (files.isEmpty() /* && hasChangedSinceLastDeployment(deployable) */)
m_d->filesToUpload << deployable;
foreach (const QString &fileName, files) {
const QString localFilePath = deployable.localFilePath
@@ -274,7 +276,7 @@ void GenericDirectUploadService::checkDeploymentNeeded(const DeployableFile &dep
+ fileInfo.fileName();
checkDeploymentNeeded(DeployableFile(localFilePath, remoteDir));
}
} else if (hasChangedSinceLastDeployment(deployable)) {
} else /* if (hasChangedSinceLastDeployment(deployable)) */ {
m_d->filesToUpload << deployable;
}
}