diff options
| author | David Faure <faure@kde.org> | 2014-05-05 11:02:12 +0200 |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2014-05-05 11:02:12 +0200 |
| commit | f5629efdec7cf8ba0a07ef6a0540fb15720fbab1 (patch) | |
| tree | 9bd25daf2460d0acabf1358738cadc8c8217ba18 /src | |
| parent | d269a544a1cc739872a990d81a4cb01137a0fdba (diff) | |
| parent | 6bb0a14db4ff6fba9a2bc24b4e57c1155e264df8 (diff) | |
| download | kconfig-4.99.0-rc4.tar.gz kconfig-4.99.0-rc4.tar.bz2 | |
Merge branch 'master' into local_releasev4.99.0-rc4
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/kconfig.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/core/kconfig.cpp b/src/core/kconfig.cpp index d3dc4173..ea9746c0 100644 --- a/src/core/kconfig.cpp +++ b/src/core/kconfig.cpp @@ -534,14 +534,8 @@ QString KConfig::mainConfigName() return globalName; } - QString fileName; - const QString domain = QCoreApplication::organizationDomain(); - if (!domain.isEmpty()) { - fileName = domain + QLatin1Char('/'); - } - - fileName += QCoreApplication::applicationName() + QLatin1String("rc"); - return fileName; + QString appName = QCoreApplication::applicationName(); + return appName + QLatin1String("rc"); } void KConfigPrivate::changeFileName(const QString &name) |