Reland macdeployqt: Don't copy .prl files into the Resources folder
QRegularExpression::isValid returns true on default constructed objects, so the filter was always matching even though it was not meant to be applied at all. Fix this by checking that there is a non-empty pattern string set and applying the filter only then. Fixes: QTBUG-87764 Change-Id: If37f8abaecacba3dc6f0b14da681a6e025367c10 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit aed7b5f3701ff51d088bc80c60b6bd4675a01077) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
parent
3602a95a8c
commit
4d10022a8d
@ -627,7 +627,8 @@ QStringList getBinaryDependencies(const QString executablePath,
|
||||
}
|
||||
|
||||
// copies everything _inside_ sourcePath to destinationPath
|
||||
bool recursiveCopy(const QString &sourcePath, const QString &destinationPath)
|
||||
bool recursiveCopy(const QString &sourcePath, const QString &destinationPath,
|
||||
const QRegularExpression &ignoreRegExp = QRegularExpression())
|
||||
{
|
||||
if (!QDir(sourcePath).exists())
|
||||
return false;
|
||||
@ -636,7 +637,10 @@ bool recursiveCopy(const QString &sourcePath, const QString &destinationPath)
|
||||
LogNormal() << "copy:" << sourcePath << destinationPath;
|
||||
|
||||
QStringList files = QDir(sourcePath).entryList(QStringList() << "*", QDir::Files | QDir::NoDotAndDotDot);
|
||||
for (const QString &file : files) {
|
||||
const bool hasValidRegExp = ignoreRegExp.isValid() && ignoreRegExp.pattern().length() > 0;
|
||||
foreach (QString file, files) {
|
||||
if (hasValidRegExp && ignoreRegExp.match(file).hasMatch())
|
||||
continue;
|
||||
const QString fileSourcePath = sourcePath + "/" + file;
|
||||
const QString fileDestinationPath = destinationPath + "/" + file;
|
||||
copyFilePrintStatus(fileSourcePath, fileDestinationPath);
|
||||
@ -769,7 +773,9 @@ QString copyFramework(const FrameworkInfo &framework, const QString path)
|
||||
// Copy Resources/, Libraries/ and Helpers/
|
||||
const QString resourcesSourcePath = framework.frameworkPath + "/Resources";
|
||||
const QString resourcesDestinationPath = frameworkDestinationDirectory + "/Versions/" + framework.version + "/Resources";
|
||||
recursiveCopy(resourcesSourcePath, resourcesDestinationPath);
|
||||
// Ignore *.prl files that are in the Resources directory
|
||||
recursiveCopy(resourcesSourcePath, resourcesDestinationPath,
|
||||
QRegularExpression("\\A(?:[^/]*\\.prl)\\z"));
|
||||
const QString librariesSourcePath = framework.frameworkPath + "/Libraries";
|
||||
const QString librariesDestinationPath = frameworkDestinationDirectory + "/Versions/" + framework.version + "/Libraries";
|
||||
bool createdLibraries = recursiveCopy(librariesSourcePath, librariesDestinationPath);
|
||||
|
Loading…
x
Reference in New Issue
Block a user