Merge remote-tracking branch 'origin/4.12'

 Conflicts:
	src/plugins/cmakeprojectmanager/fileapiparser.cpp

Change-Id: I39f8c2be859be043f506bef77de9bb5b42d38165

1 files changed, 10 insertions, 10 deletions

diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp
index 52cfbd44612..c86ced4cba7 100644
--- a/src/plugins/android/androidsettingswidget.cpp
+++ b/src/plugins/android/androidsettingswidget.cpp
@@ -788,16 +788,16 @@ void AndroidSettingsWidget::downloadOpenSslRepo(const bool silent)
     qCDebug(androidsettingswidget) << "Cloning OpenSSL repo: " << gitCloneCommand.toUserOutput();
 
     QDir openSslDir(openSslPath.toString());
-    if (openSslDir.exists()) {
-        auto userInput = QMessageBox::information(this, openSslCloneTitle,
-            tr("The selected download path (%1) for OpenSSL already exists. "
-               "Remove and overwrite its content?")
-                .arg(QDir::toNativeSeparators(openSslPath.toString())),
-            QMessageBox::Yes | QMessageBox::No);
-        if (userInput == QMessageBox::Yes)
-            openSslDir.removeRecursively();
-        else
-            return;
+    const bool isEmptyDir = openSslDir.isEmpty(QDir::AllEntries | QDir::NoDotAndDotDot
+                                               | QDir::Hidden | QDir::System);
+    if (openSslDir.exists() && !isEmptyDir) {
+        QMessageBox::information(
+            this,
+            openSslCloneTitle,
+            tr("The selected download path (%1) for OpenSSL already exists and the directory is "
+               "not empty. Select a different path or make sure it is an empty directory.")
+                .arg(QDir::toNativeSeparators(openSslPath.toString())));
+        return;
     }
 
     QProgressDialog *openSslProgressDialog