summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Whiting <[email protected]>2015-06-24 06:31:29 -0600
committerJeremy Whiting <[email protected]>2015-07-10 10:59:30 -0600
commit3cffb9abc3d0c0fd3c861f65cc7738fbe7568b54 (patch)
tree3feec2c65a76b61f2bb8f5a22b7133e55a4475fe
parent1e58d07900948745f31978cccb287c39e8d3c94b (diff)
Use KIO::Overwrite when saving a changed file otherwise it always fails.v15.08.2v15.08.1v15.08.0v15.07.90v15.07.80
BUG:347760 REVIEW:124163
-rw-r--r--komparemodellist.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/komparemodellist.cpp b/komparemodellist.cpp
index 3224277..dded4eb 100644
--- a/komparemodellist.cpp
+++ b/komparemodellist.cpp
@@ -417,14 +417,14 @@ bool KompareModelList::saveDestination( DiffModel* model )
return false;
}
}
- KIO::FileCopyJob* copyJob = KIO::file_copy( QUrl::fromLocalFile( temp.fileName() ), fullDestinationPath );
+ KIO::FileCopyJob* copyJob = KIO::file_copy( QUrl::fromLocalFile( temp.fileName() ), fullDestinationPath, -1, KIO::Overwrite);
result = copyJob->exec();
}
else
{
qCDebug(LIBKOMPAREDIFF2) << "Tempfilename : " << temp.fileName();
qCDebug(LIBKOMPAREDIFF2) << "DestinationURL : " << m_info->destination;
- KIO::FileCopyJob* copyJob = KIO::file_copy( QUrl::fromLocalFile( temp.fileName() ), m_info->destination );
+ KIO::FileCopyJob* copyJob = KIO::file_copy( QUrl::fromLocalFile( temp.fileName() ), m_info->destination , -1, KIO::Overwrite);
result = copyJob->exec();
qCDebug(LIBKOMPAREDIFF2) << "true or false?" << result;
}