diff --git a/3rdparty/macdeployqt/main.cpp b/3rdparty/macdeployqt/main.cpp index 7353418d7..25e4778ec 100644 --- a/3rdparty/macdeployqt/main.cpp +++ b/3rdparty/macdeployqt/main.cpp @@ -87,7 +87,7 @@ int main(int argc, char **argv) appBundlePath = QDir::cleanPath(appBundlePath); - if (QDir().exists(appBundlePath) == false) { + if (!QDir(appBundlePath).exists()) { qDebug() << "Error: Could not find app bundle" << appBundlePath; return 1; } diff --git a/3rdparty/macdeployqt/shared.cpp b/3rdparty/macdeployqt/shared.cpp index c7d42c2c0..935c5205b 100644 --- a/3rdparty/macdeployqt/shared.cpp +++ b/3rdparty/macdeployqt/shared.cpp @@ -104,7 +104,7 @@ inline QDebug operator<<(QDebug debug, const ApplicationBundleInfo &info) bool copyFilePrintStatus(const QString &from, const QString &to) { - if (QFile(to).exists()) { + if (QFile::exists(to)) { if (alwaysOwerwriteEnabled) { QFile(to).remove(); } else { @@ -141,7 +141,7 @@ bool copyFilePrintStatus(const QString &from, const QString &to) bool linkFilePrintStatus(const QString &file, const QString &link) { - if (QFile(link).exists()) { + if (QFile::exists(link)) { if (QFile(link).symLinkTarget().isEmpty()) LogError() << link << "exists but it's a file."; else @@ -754,7 +754,7 @@ QString copyDylib(const FrameworkInfo &framework, const QString path) } // Return if the dylib has already been deployed - if (QFileInfo(dylibDestinationBinaryPath).exists() && !alwaysOwerwriteEnabled) + if (QFileInfo::exists(dylibDestinationBinaryPath) && !alwaysOwerwriteEnabled) return dylibDestinationBinaryPath; // Copy dylib binary @@ -821,7 +821,7 @@ QString copyFramework(const FrameworkInfo &framework, const QString path) // Contents/Info.plist should be Versions/5/Resources/Info.plist const QString legacyInfoPlistPath = framework.frameworkPath + "/Contents/Info.plist"; const QString correctInfoPlistPath = frameworkDestinationDirectory + "/Resources/Info.plist"; - if (QFile(legacyInfoPlistPath).exists()) { + if (QFile::exists(legacyInfoPlistPath)) { copyFilePrintStatus(legacyInfoPlistPath, correctInfoPlistPath); patch_debugInInfoPlist(correctInfoPlistPath); } @@ -1443,11 +1443,11 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf #endif // Fallback: Look relative to the macdeployqt binary - if (!QFile(qmlImportScannerPath).exists()) + if (!QFile::exists(qmlImportScannerPath)) qmlImportScannerPath = QCoreApplication::applicationDirPath() + "/qmlimportscanner"; // Verify that we found a qmlimportscanner binary - if (!QFile(qmlImportScannerPath).exists()) { + if (!QFile::exists(qmlImportScannerPath)) { LogError() << "qmlimportscanner not found at" << qmlImportScannerPath; LogError() << "Rebuild qtdeclarative/tools/qmlimportscanner"; return false;