From 917f355e66ece5425f3a49c47a77f61762f292df Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Mon, 18 Dec 2017 13:36:47 +0200 Subject: 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 --- src/libs/installer/packagemanagercore_p.cpp | 4 ++-- 1 file 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) -- cgit v1.2.3