diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-03 03:01:34 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-03 03:01:34 +0100 |
commit | 28811dad02f18a3dc0eeae9d91cd4819780626ee (patch) | |
tree | 7ced78142ce3f8815df7082f25a83048dd0d855f /src/macdeployqt/shared | |
parent | 94c0fd2b718332f9307b6de4e3863540612aed54 (diff) | |
parent | 782a097d8950dca2620a8952856864ede62b0b59 (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Iff33dc736e4844af2c1c8e227ef1145d77fc1d85
Diffstat (limited to 'src/macdeployqt/shared')
-rw-r--r-- | src/macdeployqt/shared/shared.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/macdeployqt/shared/shared.cpp b/src/macdeployqt/shared/shared.cpp index b308a6007..eb2314bfc 100644 --- a/src/macdeployqt/shared/shared.cpp +++ b/src/macdeployqt/shared/shared.cpp @@ -185,7 +185,7 @@ OtoolInfo findDependencyInfo(const QString &binaryPath) "current version (\\d+\\.\\d+\\.\\d+)\\)$")); QString output = otool.readAllStandardOutput(); - QStringList outputLines = output.split("\n", QString::SkipEmptyParts); + QStringList outputLines = output.split("\n", Qt::SkipEmptyParts); if (outputLines.size() < 2) { LogError() << "Could not parse otool output:" << output; return info; |