From 499edcea257637b498a64ffb80df35b4e04f6f4b Mon Sep 17 00:00:00 2001
From: David Edmundson <kde@davidedmundson.co.uk>
Date: Wed, 8 Aug 2018 18:36:35 +0100
Subject: Fix cleanup of kconfigtest kdeglobals

Summary:
We expand the path of kdeglobals to
~/.qttest/kconfigtests/../kdeglobals

which works during the test, but this cleanup is run both on startup and
after removing ~/.qttest/kconfigtests    at which point the expansion
fails.

Test Plan: Ran test, looked at qttest dir. It had cleaned up

Reviewers: broulik

Reviewed By: broulik

Subscribers: kde-frameworks-devel

Tags: #frameworks

Differential Revision: https://phabricator.kde.org/D13032
---
 autotests/kconfigtest.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'autotests/kconfigtest.cpp')

diff --git a/autotests/kconfigtest.cpp b/autotests/kconfigtest.cpp
index bb3245f2..4ae6d5b8 100644
--- a/autotests/kconfigtest.cpp
+++ b/autotests/kconfigtest.cpp
@@ -94,7 +94,7 @@ static inline QString testConfigDir() {
 }
 
 static inline QString kdeGlobalsPath() {
-    return testConfigDir() + "../kdeglobals";
+    return QDir::cleanPath(testConfigDir() + "..") + "/kdeglobals";
 }
 
 void KConfigTest::initTestCase()
-- 
cgit v1.2.1