dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

macdeployqt: Adapt upstream change

Browse Source
This commit is contained in:
Jonas Kvinge
2021-08-19 19:13:43 +02:00
parent 50ab01d9c9
commit 46d927291c
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
3rdparty/macdeployqt/shared.cpp vendored
View File

@@ -1435,12 +1435,10 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf
LogNormal() << "Application QML file path(s) is" << qmlDirs; LogNormal() << "Application QML file path(s) is" << qmlDirs;
LogNormal() << "QML module search path(s) is" << qmlImportPaths; LogNormal() << "QML module search path(s) is" << qmlImportPaths;
// Use qmlimportscanner from QLibraryInfo::BinariesPath // Use qmlimportscanner from QLibraryInfo::LibraryExecutablesPath
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) QString qmlImportScannerPath =
QString qmlImportScannerPath = QDir::cleanPath(QLibraryInfo::path(QLibraryInfo::BinariesPath) + "/qmlimportscanner"); QDir::cleanPath(QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)
#else + "/qmlimportscanner");
QString qmlImportScannerPath = QDir::cleanPath(QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmlimportscanner");
#endif
// Fallback: Look relative to the macdeployqt binary // Fallback: Look relative to the macdeployqt binary
if (!QFile(qmlImportScannerPath).exists()) if (!QFile(qmlImportScannerPath).exists())