summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiels Weber <niels.weber@digia.com>2013-06-18 13:01:14 +0200
committerNiels Weber <niels.weber@digia.com>2013-06-18 14:00:23 +0200
commitfe8af8bdc77f6ed7aed64c56c287433f4de804f9 (patch)
treefa103953fea42cf70c05ccded72b8ebec0c4feb7
parent1b4350f193a7e651b97478febdba8bf76636ce61 (diff)
Disallow installing over existing installation.
Task-number: QTIFW-278 Change-Id: I5e435ac95c2efd699c1515592cdaaf698c3bc215 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
-rw-r--r--src/sdk/installerbasecommons.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/sdk/installerbasecommons.cpp b/src/sdk/installerbasecommons.cpp
index 925bbcbe6..5ec753f2f 100644
--- a/src/sdk/installerbasecommons.cpp
+++ b/src/sdk/installerbasecommons.cpp
@@ -489,9 +489,8 @@ bool TargetDirectoryPageImpl::validatePage()
QFileInfo fi2(targetDir + QDir::separator() + fileName);
if (fi2.exists()) {
- return askQuestion(QLatin1String("OverwriteTargetDirectory"),
- TargetDirectoryPageImpl::tr("The folder you selected exists already and contains an "
- "installation.\nDo you want to overwrite it?"));
+ return failWithError(QLatin1String("TargetDirectoryInUse"), tr("The folder you selected already "
+ "exists and contains an installation. Choose a different target for installation."));
}
return askQuestion(QLatin1String("OverwriteTargetDirectory"),