summaryrefslogtreecommitdiffstats
path: root/depends/util/src
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2013-12-17 02:09:58 +0100
committerPetr Mrázek <peterix@gmail.com>2013-12-20 23:04:11 +0100
commitd6c71488b34a2854461feee3296c11568542ecbe (patch)
tree9486ced2bfb437178d1abe827dc29f00edd7783d /depends/util/src
parent20e86801b3cc889a07cd8eef744b06b77a2239cc (diff)
downloadMultiMC-d6c71488b34a2854461feee3296c11568542ecbe.tar
MultiMC-d6c71488b34a2854461feee3296c11568542ecbe.tar.gz
MultiMC-d6c71488b34a2854461feee3296c11568542ecbe.tar.lz
MultiMC-d6c71488b34a2854461feee3296c11568542ecbe.tar.xz
MultiMC-d6c71488b34a2854461feee3296c11568542ecbe.zip
Some test madness
Diffstat (limited to 'depends/util/src')
-rw-r--r--depends/util/src/pathutils.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/depends/util/src/pathutils.cpp b/depends/util/src/pathutils.cpp
index 485d03e8..20888754 100644
--- a/depends/util/src/pathutils.cpp
+++ b/depends/util/src/pathutils.cpp
@@ -23,10 +23,7 @@
QString PathCombine(QString path1, QString path2)
{
- if (!path1.endsWith('/'))
- return path1.append('/').append(path2);
- else
- return path1.append(path2);
+ return QDir::cleanPath(path1 + QDir::separator() + path2);
}
QString PathCombine(QString path1, QString path2, QString path3)