Revert "macdeployqt: Don't copy .prl files into the Resources folder"

This was skipping other files from Resources/ as well,
such as “en-GB.pak” and “QtWebEngineProcess”.

This reverts commit aabba72f7965e06e2e6ed960d8cf8078249dac8c.

Fixes: QTBUG-86759
Pick-to: 5.15
Change-Id: I6d27e3a32b479e1b6765783af71dd16826b181ca
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>

1 files changed, 2 insertions, 8 deletions

diff --git a/src/macdeployqt/shared/shared.cpp b/src/macdeployqt/shared/shared.cpp
index 838bd0b91..aaf66d2a8 100644
--- a/src/macdeployqt/shared/shared.cpp
+++ b/src/macdeployqt/shared/shared.cpp
@@ -639,8 +639,7 @@ QStringList getBinaryDependencies(const QString executablePath,
 }
 
 // copies everything _inside_ sourcePath to destinationPath
-bool recursiveCopy(const QString &sourcePath, const QString &destinationPath,
-                   const QRegularExpression &ignoreRegExp = QRegularExpression())
+bool recursiveCopy(const QString &sourcePath, const QString &destinationPath)
 {
     if (!QDir(sourcePath).exists())
         return false;
@@ -649,10 +648,7 @@ bool recursiveCopy(const QString &sourcePath, const QString &destinationPath,
     LogNormal() << "copy:" << sourcePath << destinationPath;
 
     QStringList files = QDir(sourcePath).entryList(QStringList() << "*", QDir::Files | QDir::NoDotAndDotDot);
-    const bool hasValidRegExp = ignoreRegExp.isValid();
     foreach (QString file, files) {
-        if (hasValidRegExp && ignoreRegExp.match(file).hasMatch())
-            continue;
         const QString fileSourcePath = sourcePath + "/" + file;
         const QString fileDestinationPath = destinationPath + "/" + file;
         copyFilePrintStatus(fileSourcePath, fileDestinationPath);
@@ -785,9 +781,7 @@ QString copyFramework(const FrameworkInfo &framework, const QString path)
     // Copy Resouces/, Libraries/ and Helpers/
     const QString resourcesSourcePath = framework.frameworkPath + "/Resources";
     const QString resourcesDestianationPath = frameworkDestinationDirectory + "/Versions/" + framework.version + "/Resources";
-    // Ignore *.prl files that are in the Resources directory
-    recursiveCopy(resourcesSourcePath, resourcesDestianationPath,
-                  QRegularExpression("\\A(?:[^/]*\\.prl)\\z"));
+    recursiveCopy(resourcesSourcePath, resourcesDestianationPath);
     const QString librariesSourcePath = framework.frameworkPath + "/Libraries";
     const QString librariesDestianationPath = frameworkDestinationDirectory + "/Versions/" + framework.version + "/Libraries";
     bool createdLibraries = recursiveCopy(librariesSourcePath, librariesDestianationPath);