diff options
| author | Jani Heikkinen <jani.heikkinen@qt.io> | 2017-12-18 13:36:47 +0200 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2017-12-19 05:51:29 +0000 |
| commit | 917f355e66ece5425f3a49c47a77f61762f292df (patch) | |
| tree | b0c0372ea87a19871517206aa93db754533be4a3 | |
| parent | 4fd983952981395ba583dfcb45544e71c4a4883e (diff) | |
Fix maintenance tool file name parsing in mac
Earlier we used QFileInfo::baseName but that doesn't work properly if
'.' are used in file names. So start using fileName instead.
Task-number: QTBUG-61262
Change-Id: I474b9656ef6d83dfbcdbc6ba6e40f95e75853c80
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| -rw-r--r-- | src/libs/installer/packagemanagercore_p.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp index fb802ef8b..b21b32832 100644 --- a/src/libs/installer/packagemanagercore_p.cpp +++ b/src/libs/installer/packagemanagercore_p.cpp @@ -1197,8 +1197,8 @@ void PackageManagerCorePrivate::writeMaintenanceTool(OperationList performedOper performOperationThreaded(op, Backup); performOperationThreaded(op); - // copy application icons if it exists - const QString icon = QFileInfo(QCoreApplication::applicationFilePath()).baseName() + // copy application icons if it exists. + const QString icon = QFileInfo(QCoreApplication::applicationFilePath()).fileName() + QLatin1String(".icns"); op = createOwnedOperation(QLatin1String("Copy")); op->setArguments(QStringList() << (sourceAppDirPath + QLatin1String("/../Resources/") + icon) |