From 625e124898afad04ab5c3939b1b129b6014046cd Mon Sep 17 00:00:00 2001
From: David Faure <faure@kde.org>
Date: Sun, 4 May 2014 19:13:53 +0200
Subject: Store app config file in ~/.config/<domain>/<app>rc

Only KSharedConfig::openConfig() and KConfig default constructor are affected.

KConfig("kdeglobals"), for instance, points to ~/.config so that it can be shared.

REVIEW: 117989
---
 src/core/kconfig.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/core/kconfig.cpp')

diff --git a/src/core/kconfig.cpp b/src/core/kconfig.cpp
index ea9746c0..d3dc4173 100644
--- a/src/core/kconfig.cpp
+++ b/src/core/kconfig.cpp
@@ -534,8 +534,14 @@ QString KConfig::mainConfigName()
         return globalName;
     }
 
-    QString appName = QCoreApplication::applicationName();
-    return appName + QLatin1String("rc");
+    QString fileName;
+    const QString domain = QCoreApplication::organizationDomain();
+    if (!domain.isEmpty()) {
+        fileName = domain + QLatin1Char('/');
+    }
+
+    fileName += QCoreApplication::applicationName() + QLatin1String("rc");
+    return fileName;
 }
 
 void KConfigPrivate::changeFileName(const QString &name)
-- 
cgit v1.2.1