From 2e9e3c41221023cc4bd26b73864b4fba72aa3db4 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Thu, 31 May 2012 19:17:29 +0200 Subject: QFileInfo.exists looks for the target which wasn't intended Change-Id: I8d371045bb500f8954a42523f8d5024b04309ceb Reviewed-by: Tim Jenssen --- src/libs/installer/createlinkoperation.cpp | 4 ++-- src/libs/installer/link.cpp | 2 +- 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); -- cgit v1.2.3