summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiels Weber <niels.weber@digia.com>2013-02-26 12:40:27 +0100
committerNiels Weber <niels.weber@digia.com>2013-02-26 15:27:01 +0100
commit0abdc5d5abe89e20110f79fb1f7497ea2c76a23f (patch)
tree50ab1a6eeeaa21ff68124bbb9cd9cacb1e497dc2
parenta852656506028cffa354f63ff8aa143376840534 (diff)
Linux: Also find tmp dir on tmpfs
Fixes both tasks together with a852656506028cffa354f63ff8aa143376840534 Task-number: QTIFW-178 Task-number: QTIFW-198 Change-Id: I0c246e8a533728753b004a0cf8e1f86083779cd9 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Michal Klocek <michal.klocek@digia.com>
-rw-r--r--src/libs/kdtools/kdsysinfo_x11.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libs/kdtools/kdsysinfo_x11.cpp b/src/libs/kdtools/kdsysinfo_x11.cpp
index 5a816dc18..391fb5280 100644
--- a/src/libs/kdtools/kdsysinfo_x11.cpp
+++ b/src/libs/kdtools/kdsysinfo_x11.cpp
@@ -74,7 +74,7 @@ QList<VolumeInfo> mountedVolumes()
if (s.isNull())
return result;
- if (!s.startsWith(QLatin1Char('/')))
+ if (!s.startsWith(QLatin1Char('/')) && !s.startsWith(QLatin1String("tmpfs ") + QDir::tempPath()))
continue;
const QStringList parts = s.split(QLatin1Char(' '), QString::SkipEmptyParts);