summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNiels Weber <niels.weber@digia.com>2013-06-18 13:01:14 +0200
committerTim Jenssen <tim.jenssen@digia.com>2013-07-25 11:37:24 +0200
commit361af37d6ccd05c7d55da505e0c59e2b9d04113e (patch)
treee6f35cb6e85255be10bfc16beb6f57fb76717f5f /src
parent98233e748f70b97f0de906f399baf96eb25b6f1e (diff)
Disallow installing over existing installation.
Task-number: QTIFW-278 Change-Id: I5e435ac95c2efd699c1515592cdaaf698c3bc215 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Diffstat (limited to 'src')
-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 becd7633a..9c2784b5a 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"),