diff options
| author | kh1 <karsten.heimrich@digia.com> | 2014-06-02 10:09:42 +0200 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@digia.com> | 2014-06-02 13:49:58 +0200 |
| commit | 3f9d4150885084478cb91ac361f0a7f4f89d5fa6 (patch) | |
| tree | a9b085e3953e242d0a7a2327679479f56fb00526 /src/libs/installer/installiconsoperation.cpp | |
| parent | 51afc1eb8ebc101ced5874eeadd73d5dfb8612bb (diff) | |
Some more qt5 only fixes.
Change-Id: I7c190667f7ae243289b3e08ff76f9f398178bc24
Reviewed-by: Niels Weber <niels.weber@digia.com>
Diffstat (limited to 'src/libs/installer/installiconsoperation.cpp')
| -rw-r--r-- | src/libs/installer/installiconsoperation.cpp | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/src/libs/installer/installiconsoperation.cpp b/src/libs/installer/installiconsoperation.cpp index dba6d644b..23787f312 100644 --- a/src/libs/installer/installiconsoperation.cpp +++ b/src/libs/installer/installiconsoperation.cpp @@ -43,15 +43,10 @@ #include "fileutils.h" #include "packagemanagercore.h" -#include <QtCore/QDir> -#include <QtCore/QDirIterator> #include <QDebug> - -#if QT_VERSION >= 0x040600 -# include <QProcessEnvironment> -#else -# include <QProcess> -#endif +#include <QDir> +#include <QDirIterator> +#include <QProcessEnvironment> using namespace QInstaller; @@ -61,19 +56,9 @@ QString InstallIconsOperation::targetDirectory() if (hasValue(QLatin1String("targetdirectory"))) return value(QLatin1String("targetdirectory")).toString(); -#if QT_VERSION >= 0x040600 const QProcessEnvironment env; QStringList XDG_DATA_DIRS = env.value(QLatin1String("XDG_DATA_DIRS")).split(QLatin1Char(':'), QString::SkipEmptyParts); -#else - QStringList XDG_DATA_DIRS; - const QStringList env = QProcess::systemEnvironment(); - for (QStringList::const_iterator it = env.begin(); it != env.end(); ++it) { - if (it->startsWith(QLatin1String("XDG_DATA_DIRS="))) - XDG_DATA_DIRS = it->mid(it->indexOf(QLatin1Char('=')) + 1).split(QLatin1Char(':')); - } -#endif - XDG_DATA_DIRS.push_back(QLatin1String("/usr/share/pixmaps")); // default path XDG_DATA_DIRS.push_back(QDir::home().absoluteFilePath(QLatin1String(".local/share/icons"))); // default path XDG_DATA_DIRS.push_back(QDir::home().absoluteFilePath(QLatin1String(".icons"))); // default path |