summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@nokia.com>2012-05-31 19:17:29 +0200
committerTim Jenssen <tim.jenssen@nokia.com>2012-05-31 20:19:13 +0200
commit2e9e3c41221023cc4bd26b73864b4fba72aa3db4 (patch)
treec28ecf3242821c8454c18fc2497347865362491d
parenta240e7dbadc3f0cbcd4a483ddf7093562df8ca37 (diff)
QFileInfo.exists looks for the target which wasn't intended
Change-Id: I8d371045bb500f8954a42523f8d5024b04309ceb Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
-rw-r--r--src/libs/installer/createlinkoperation.cpp4
-rw-r--r--src/libs/installer/link.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libs/installer/createlinkoperation.cpp b/src/libs/installer/createlinkoperation.cpp
index fefe36cd6..48c2774d1 100644
--- a/src/libs/installer/createlinkoperation.cpp
+++ b/src/libs/installer/createlinkoperation.cpp
@@ -81,10 +81,10 @@ bool CreateLinkOperation::undoOperation()
const QString& linkPath = args.at(0);
const QString& targetPath = args.at(1);
- if (!QFileInfo(linkPath).exists()) {
+ Link link = Link(linkPath);
+ if (!link.exists()) {
return true;
}
- Link link = Link(linkPath);
if (!link.remove()) {
setError(UserDefinedError);
setErrorString(QObject::tr("Could not remove link from %1 to %2.").arg(linkPath, targetPath));
diff --git a/src/libs/installer/link.cpp b/src/libs/installer/link.cpp
index 59a56a397..0ac597e1b 100644
--- a/src/libs/installer/link.cpp
+++ b/src/libs/installer/link.cpp
@@ -285,7 +285,7 @@ bool Link::isValid()
bool Link::remove()
{
- if (!QFileInfo(m_path).exists())
+ if (!exists())
return false;
#ifdef Q_OS_WIN
return removeJunction(m_path);