diff options
Diffstat (limited to 'src/libs/installer/installiconsoperation.cpp')
-rw-r--r-- | src/libs/installer/installiconsoperation.cpp | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/src/libs/installer/installiconsoperation.cpp b/src/libs/installer/installiconsoperation.cpp index 7b02bb964..08ac6e8d5 100644 --- a/src/libs/installer/installiconsoperation.cpp +++ b/src/libs/installer/installiconsoperation.cpp @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. @@ -40,13 +40,13 @@ using namespace QInstaller; QString InstallIconsOperation::targetDirectory() { // we're not searching for the first time, let's re-use the old value - if (hasValue(QLatin1String("targetdirectory"))) - return value(QLatin1String("targetdirectory")).toString(); + if (hasValue(QLatin1String("directory"))) + return value(QLatin1String("directory")).toString(); QStringList XDG_DATA_HOME = QString::fromLocal8Bit(qgetenv("XDG_DATA_HOME")) .split(QLatin1Char(':'), QString::SkipEmptyParts); - XDG_DATA_HOME.push_back(QDir::home().absoluteFilePath(QLatin1String(".local/share/icons"))); // default path + XDG_DATA_HOME.push_back(QDir::home().absoluteFilePath(QLatin1String(".local/share"))); // default path QString directory; const QStringList& directories = XDG_DATA_HOME; @@ -54,11 +54,7 @@ QString InstallIconsOperation::targetDirectory() if (it->isEmpty()) continue; - // our default dirs are correct, XDG_DATA_HOME set via env needs "icon" at the end - if ((it + 1 == directories.end()) || (it + 2 == directories.end()) || (it + 3 == directories.end())) - directory = QDir(*it).absolutePath(); - else - directory = QDir(*it).absoluteFilePath(QLatin1String("icons")); + directory = QDir(*it).absoluteFilePath(QLatin1String("icons")); QDir dir(directory); // let's see if this dir exists or we're able to create it @@ -90,11 +86,6 @@ InstallIconsOperation::InstallIconsOperation(PackageManagerCore *core) setName(QLatin1String("InstallIcons")); } -InstallIconsOperation::~InstallIconsOperation() -{ - const QStringList backupFiles = value(QLatin1String("backupfiles")).toStringList(); -} - void InstallIconsOperation::backup() { // we backup on the fly |