From c22ed5528d717acc56203c38bdf80ccadfa4af10 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <thomas.hartmann@qt.io>
Date: Mon, 22 Feb 2021 14:55:53 +0100
Subject: [PATCH] Add support for powershell Expand-Archive for archives

This will work with any Windows 10 installation.

Change-Id: Ia7ca25a5ba4e199ccfc37138e228c4d56f0f8a6a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/libs/utils/archive.cpp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/libs/utils/archive.cpp b/src/libs/utils/archive.cpp
index 19618ed8bcc..9f61eb28abe 100644
--- a/src/libs/utils/archive.cpp
+++ b/src/libs/utils/archive.cpp
@@ -45,6 +45,7 @@ struct Tool
     QStringList arguments;
     QStringList supportedMimeTypes;
     QStringList additionalSearchDirs;
+    bool nativeWindowsArguments = false;
 };
 
 static QStringList additionalInstallDirs(const QString &registryKey, const QString &valueName)
@@ -64,6 +65,13 @@ static const QVector<Tool> &sTools()
 {
     static QVector<Tool> tools;
     if (tools.isEmpty()) {
+        if (Utils::HostOsInfo::isWindowsHost()) {
+            tools << Tool{{"powershell"},
+                          {"-command Expand-Archive -Force '%{src}' '%{dest}'"},
+                          {"application/zip"},
+                          {},
+                          true};
+        }
         tools << Tool{{"unzip"}, {"-o", "%{src}", "-d", "%{dest}"}, {"application/zip"}, {}};
         tools << Tool{{"7z"},
                       {"x", "-o%{dest}", "-y", "-bb", "%{src}"},
@@ -247,7 +255,15 @@ Archive *Archive::unarchive(const FilePath &src, const FilePath &dest)
                      workingDirectory));
     });
     archive->m_process->setProgram(tool->executable);
+
+#ifdef Q_OS_WIN
+    if (!tool->nativeWindowsArguments)
+        archive->m_process->setArguments(tool->arguments);
+    else if (!tool->arguments.isEmpty())
+        archive->m_process->setNativeArguments(tool->arguments.at(0));
+#else
     archive->m_process->setArguments(tool->arguments);
+#endif
     archive->m_process->setWorkingDirectory(workingDirectory);
     archive->m_process->start(QProcess::ReadOnly);
     return archive;