kconfig.git/src, branch v5.30.0-rc1 hurd kconfig.git Generate an instance with KSharedConfig::Ptr for singleton and arg 2017-01-06T08:52:45+00:00 Martin Gräßlin mgraesslin@kde.org 2016-11-16T13:59:28+00:00 e0db2422362260a2fea3a8e1de4c64011d2f183d Summary: In case a kcfg with arg="true" was used and singleton the static instance method only accepted a QString config name. This made it impossible to combine a singleton config with an already existing and open KSharedConfig::Ptr. With this change an overloaded instance method is added which takes a KSharedConfig::Ptr as argument. The private ctor, though, only takes a KSharedConfig::Ptr and the instance method taking a QString argument uses KSharedConfig::openConfig on the config file name. The change is source-incompatible in the following situation: * kcfgfile arg="true" * Singleton = true * Inherits is specified In this situation the previous revision created an instance method with a QString argument and passed that to the parent constructor. This is not in accordance with the documentation. Any user of this behavior was relying on a bug. With this change now the call to the parent constructor carries a KSharedConfigPtr. Test Plan: kconfigcompiler tests still pass and a config with singleton and arg="true" generates the code as I need it Reviewers: #frameworks, dfaure, mdawson Differential Revision: https://phabricator.kde.org/D3690 
Summary:
In case a kcfg with arg="true" was used and singleton the static
instance method only accepted a QString config name. This made it
impossible to combine a singleton config with an already existing and
open KSharedConfig::Ptr.

With this change an overloaded instance method is added which takes a
KSharedConfig::Ptr as argument. The private ctor, though, only takes a
KSharedConfig::Ptr and the instance method taking a QString argument
uses KSharedConfig::openConfig on the config file name.

The change is source-incompatible in the following situation:
* kcfgfile arg="true"
* Singleton = true
* Inherits is specified

In this situation the previous revision created an instance method with
a QString argument and passed that to the parent constructor. This is
not in accordance with the documentation. Any user of this behavior was
relying on a bug. With this change now the call to the parent
constructor carries a KSharedConfigPtr.

Test Plan:
kconfigcompiler tests still pass and a config with singleton
and arg="true" generates the code as I need it

Reviewers: #frameworks, dfaure, mdawson

Differential Revision: https://phabricator.kde.org/D3690
Fix build with CMP 0026 set to NEW 2017-01-03T14:39:11+00:00 Sven Brauch mail@svenbrauch.de 2017-01-03T14:38:17+00:00 72cc5afbdf8acc6505d7ee382cd3a00aca63df9b 






Q_ENUMS -> Q_ENUM and Q_FLAGS -> Q_FLAG
2017-01-02T14:52:51+00:00

Albert Astals Cid
aacid@kde.org

2017-01-02T14:52:51+00:00

383bb299f4694d2609036b8061316ae4b80e3f75

REVIEW: 129745





REVIEW: 129745







SVN_SILENT made messages (.desktop file) - always resolve ours
2016-12-21T04:46:48+00:00

l10n daemon script
scripty@kde.org

2016-12-21T04:46:48+00:00

9d5b64f16243d14e27402be23224f08cd8420bbe

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"





In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"







SVN_SILENT made messages (.desktop file) - always resolve ours
2016-12-20T11:50:08+00:00

l10n daemon script
scripty@kde.org

2016-12-20T11:50:08+00:00

f86f153a8050c9337e0f6c7b84171f50474df3b1

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"





In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"







[kconfig_compiler] Improve documentation about Inherits
2016-12-17T08:49:46+00:00

Martin Gräßlin
mgraesslin@kde.org

2016-12-10T18:20:50+00:00

b4206d635444580bd00a0e7dabd939d86134ee72

Summary:
Better specify the requirements the parent class needs to have.
KConfigCompiler generates different variants of ctors taking either:
 * a QStringLiteral argument (name set in <kcfgfile>
 * a KSharedConfig::Ptr argument (arg="true" in <kcfgfile>)
 * no argument (Inherits=true in kcfgc and no <kcfgfile>)

In order to have Inherits generate compiling code in all cases the
parent class needs to provide accessible ctors.

This change updates the docuementation to reflect this.

Reviewers: #frameworks, dfaure

Differential Revision: https://phabricator.kde.org/D3636





Summary:
Better specify the requirements the parent class needs to have.
KConfigCompiler generates different variants of ctors taking either:
 * a QStringLiteral argument (name set in <kcfgfile>
 * a KSharedConfig::Ptr argument (arg="true" in <kcfgfile>)
 * no argument (Inherits=true in kcfgc and no <kcfgfile>)

In order to have Inherits generate compiling code in all cases the
parent class needs to provide accessible ctors.

This change updates the docuementation to reflect this.

Reviewers: #frameworks, dfaure

Differential Revision: https://phabricator.kde.org/D3636







kconfig_compiler: Use nullptr in generated code
2016-12-16T11:45:40+00:00

Kevin Funk
kfunk@kde.org

2016-12-16T11:35:32+00:00

e6c88f67e2cb660e049a478a8d55220c235aa9c5

Reviewers: #frameworks, davidedmundson

Reviewed By: davidedmundson

Differential Revision: https://phabricator.kde.org/D3702





Reviewers: #frameworks, davidedmundson

Reviewed By: davidedmundson

Differential Revision: https://phabricator.kde.org/D3702







Revert "Generate an instance with KSharedConfig::Ptr for singleton and arg"
2016-12-07T08:29:38+00:00

David Faure
faure@kde.org

2016-12-07T08:29:31+00:00

4f9d7dde3a06da26d93e8f7ec98a283111a2d8c9

This reverts commit cd4e6504dfbdface00037625f0cedda511e6d839.

As suggested by Martin on release-team@kde.org, given that it breaks SC.





This reverts commit cd4e6504dfbdface00037625f0cedda511e6d839.

As suggested by Martin on release-team@kde.org, given that it breaks SC.







Generate an instance with KSharedConfig::Ptr for singleton and arg
2016-12-02T18:04:13+00:00

Martin Gräßlin
mgraesslin@kde.org

2016-11-16T13:59:28+00:00

cd4e6504dfbdface00037625f0cedda511e6d839

Summary:
In case a kcfg with arg="true" was used and singleton the static
instance method only accepted a QString config name. This made it
impossible to combine a singleton config with an already existing and
open KSharedConfig::Ptr.

With this change an overloaded instance method is added which takes a
KSharedConfig::Ptr as argument. The private ctor, though, only takes a
KSharedConfig::Ptr and the instance method taking a QString argument
uses KSharedConfig::openConfig on the config file name.

This provides full API compatibility and at the same time allows to use
KSharedConfig in addition to the arg name based variant.

Test Plan:
kconfigcompiler tests still pass and a config with singleton
and arg="true" generates the code as I need it

Reviewers: #frameworks

Differential Revision: https://phabricator.kde.org/D3386





Summary:
In case a kcfg with arg="true" was used and singleton the static
instance method only accepted a QString config name. This made it
impossible to combine a singleton config with an already existing and
open KSharedConfig::Ptr.

With this change an overloaded instance method is added which takes a
KSharedConfig::Ptr as argument. The private ctor, though, only takes a
KSharedConfig::Ptr and the instance method taking a QString argument
uses KSharedConfig::openConfig on the config file name.

This provides full API compatibility and at the same time allows to use
KSharedConfig in addition to the arg name based variant.

Test Plan:
kconfigcompiler tests still pass and a config with singleton
and arg="true" generates the code as I need it

Reviewers: #frameworks

Differential Revision: https://phabricator.kde.org/D3386







Properly test environment variable
2016-11-17T11:16:36+00:00

Aleix Pol
aleixpol@kde.org

2016-11-08T23:54:56+00:00

49203c61c7b6fc9629e85b118bdfcd1c468287ca

Summary: use qEnvironmentVariableIsSet instead of qgetenv().isEmpty()

Reviewers: #frameworks, sebas, sitter

Reviewed By: sebas, sitter

Differential Revision: https://phabricator.kde.org/D3314





Summary: use qEnvironmentVariableIsSet instead of qgetenv().isEmpty()

Reviewers: #frameworks, sebas, sitter

Reviewed By: sebas, sitter

Differential Revision: https://phabricator.kde.org/D3314