winrt: arm: copy ucrtbased.dll in debug mode

For Windows 10 / MSVC2015 winrtrunner fails to run an app in debug mode
on an arm device as symbols were not found (neither in the system or c-
runtime dependency). Those symbols are inside ucrtbased.dll. Visual
Studio 2015 silently adds this library to the package resulting in a
different content compared to windeployqt.

Hence, copy ucrtbased.dll manually from windeployqt as well, which will
later on be packaged by winrtrunner.

Task-number: QTBUG-52969
Change-Id: If43a814b800d0756d111557a042aa23a22d7589f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

1 files changed, 27 insertions, 0 deletions

diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp
index d11454717..9b8262805 100644
--- a/src/windeployqt/main.cpp
+++ b/src/windeployqt/main.cpp
@@ -1350,6 +1350,33 @@ static DeployResult deploy(const Options &options,
         }
     } // Windows
 
+    // We need to copy ucrtbased.dll on WinRT as this library is not part of
+    // the c runtime package. VS 2015 does the same when deploying to a device
+    // or creating an appx.
+    if (isDebug && options.platform == WinRtArm
+             && qmakeVariables.value(QStringLiteral("QMAKE_XSPEC")).endsWith(QLatin1String("msvc2015"))) {
+        const QString extensionPath = QString::fromLocal8Bit(qgetenv("ExtensionSdkDir"));
+        const QString ucrtVersion = QString::fromLocal8Bit(qgetenv("UCRTVersion"));
+        if (extensionPath.isEmpty() || ucrtVersion.isEmpty()) {
+            std::wcerr << "Warning: Cannot find ucrtbased.dll as either "
+                << "ExtensionSdkDir or UCRTVersion is not set in "
+                << "your environment.\n";
+        } else {
+            const QString ucrtbasedLib = extensionPath
+                    + QStringLiteral("/Microsoft.UniversalCRT.Debug/")
+                    + ucrtVersion
+                    + QStringLiteral("/Redist/Debug/arm/ucrtbased.dll");
+            const QFileInfo ucrtPath(ucrtbasedLib);
+            if (ucrtPath.exists() && ucrtPath.isFile()) {
+                deployedQtLibraries.append(ucrtPath.absoluteFilePath());
+            } else {
+                std::wcerr << "Warning: Cannot find ucrtbased.dll at "
+                           << QDir::toNativeSeparators(ucrtbasedLib)
+                           << " or it is not a file.\n";
+            }
+        }
+    }
+
     // Update libraries
     if (options.libraries) {
         const QString targetPath = options.libraryDirectory.isEmpty() ?