4 files changed, 10 insertions, 6 deletions
diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp
index 9d594b2eb..75cd4a4cf 100644
--- a/src/libs/installer/packagemanagercore.cpp
+++ b/src/libs/installer/packagemanagercore.cpp
@@ -1030,8 +1030,9 @@ QString PackageManagerCore::fromNativeSeparators(const QString &path)
 }
 
 /*!
-    Checks whether the target directory \a targetDirectory exists and has contents:
+    Checks whether installation is allowed to \a targetDirectory:
     \list
+        \li Returns \c true if the directory does not exist.
         \li Returns \c true if the directory exists and is empty.
         \li Returns \c false if the directory already exists and contains an installation.
         \li Returns \c false if the target is a file or a symbolic link.
@@ -1039,14 +1040,17 @@ QString PackageManagerCore::fromNativeSeparators(const QString &path)
             choice that the end users make in the displayed message box.
     \endlist
 */
-bool PackageManagerCore::checkTargetDir(const QString &targetDirectory)
+bool PackageManagerCore::installationAllowedToDirectory(const QString &targetDirectory)
 {
+    const QFileInfo fi(targetDirectory);
+    if (!fi.exists())
+        return true;
+
     const QDir dir(targetDirectory);
     // the directory exists and is empty...
     if (dir.exists() && dir.entryList(QDir::AllEntries | QDir::NoDotAndDotDot).isEmpty())
         return true;
 
-    const QFileInfo fi(targetDirectory);
     if (fi.isDir()) {
         QString fileName = settings().maintenanceToolName();
 #if defined(Q_OS_MACOS)
diff --git a/src/libs/installer/packagemanagercore.h b/src/libs/installer/packagemanagercore.h
index 6698155c3..6b5a04728 100644
--- a/src/libs/installer/packagemanagercore.h
+++ b/src/libs/installer/packagemanagercore.h
@@ -216,7 +216,7 @@ public:
     Q_INVOKABLE QString toNativeSeparators(const QString &path);
     Q_INVOKABLE QString fromNativeSeparators(const QString &path);
 
-    bool checkTargetDir(const QString &targetDirectory);
+    bool installationAllowedToDirectory(const QString &targetDirectory);
     QString targetDirWarning(const QString &targetDirectory) const;
 
 public:
diff --git a/src/libs/installer/packagemanagergui.cpp b/src/libs/installer/packagemanagergui.cpp
index d28c5f7ca..a6481b863 100644
--- a/src/libs/installer/packagemanagergui.cpp
+++ b/src/libs/installer/packagemanagergui.cpp
@@ -2392,7 +2392,7 @@ bool TargetDirectoryPage::validatePage()
     if (!QVariant(remove).toBool())
         return true;
 
-    return this->packageManagerCore()->checkTargetDir(targetDir());
+    return this->packageManagerCore()->installationAllowedToDirectory(targetDir());
 }
 
 /*!
diff --git a/src/sdk/commandlineinterface.cpp b/src/sdk/commandlineinterface.cpp
index 6b674364c..63deaf4d9 100644
--- a/src/sdk/commandlineinterface.cpp
+++ b/src/sdk/commandlineinterface.cpp
@@ -267,7 +267,7 @@ bool CommandLineInterface::setTargetDir()
         targetDir = m_core->value(QInstaller::scTargetDir);
         qCDebug(QInstaller::lcInstallerInstallLog) << "No target directory specified, using default value:" << targetDir;
     }
-    if (m_core->checkTargetDir(targetDir)) {
+    if (m_core->installationAllowedToDirectory(targetDir)) {
         QString targetDirWarning = m_core->targetDirWarning(targetDir);
         if (!targetDirWarning.isEmpty()) {
             qCWarning(QInstaller::lcInstallerInstallLog) << m_core->targetDirWarning(targetDir);