kconfig.git/src/core, branch v5.10.0 hurd kconfig.git SVN_SILENT made messages (.desktop file) - always resolve ours 2015-04-07T13:15:22+00:00 l10n daemon script scripty@kde.org 2015-04-07T13:15:22+00:00 390178b4a6f7d3621b0593e3b73fdb3d13ac0e57 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: fix using KSharedConfig in global object destructor. 2015-04-04T11:44:01+00:00 David Faure faure@kde.org 2015-04-04T11:40:21+00:00 ee599bfa17f7e56b0db1a4afbbfe929ec90f2c9d ksharedconfig_in_global_object.cpp is now in kdelibs4 too (where it works) and reproduces Albert's KgDifficulty testcase. CHANGELOG: fix assert when using KSharedConfig in a global object destructor. REVIEW: 122232 
ksharedconfig_in_global_object.cpp is now in kdelibs4 too
(where it works) and reproduces Albert's KgDifficulty testcase.

CHANGELOG: fix assert when using KSharedConfig in a global object destructor.
REVIEW: 122232
mini-optimization by fixing defects found by coverity and using QByteArrayLiteral 2015-03-20T22:12:43+00:00 Nick Shaforostoff shafff@ukr.net 2015-03-20T22:12:43+00:00 5a8fe6681fdb283fdf22fefaca7d19ccfc43c7cd 






not necessary to have virtual + Q_DECL_OVERRIDE
2015-02-25T07:51:58+00:00

Montel Laurent
montel@kde.org

2015-02-25T07:51:58+00:00

9fed4e3bbe5e72641d9793badb090290ce237fae












Avoid code path that leaves local config locked
2015-02-19T10:49:31+00:00

David Edmundson
kde@davidedmundson.co.uk

2015-02-12T21:29:04+00:00

5a28172868cdc51607e0e87172d4d4fb6f01b896

The local config file gets locked on line 415, if we return early we
need to unlock it.

REVIEW: 122549
BUG: 344032





The local config file gets locked on line 415, if we return early we
need to unlock it.

REVIEW: 122549
BUG: 344032







at KDesktopFile::locateLocal, correct the expression of the if statement which was always TRUE
2015-02-16T18:28:45+00:00

Guy Maurel
guy.maurel@kde.org

2015-02-16T18:28:45+00:00

93dd4856d096e214786734db80ac8f778b913333

REVIEW: 122445





REVIEW: 122445







Use Q_DECL_OVERRIDE where possible
2015-02-12T12:54:33+00:00

Kevin Funk
kfunk@kde.org

2015-02-11T23:17:57+00:00

28ddbf8138c865e19e8836b49af74f9d3bc20401

With -Winconsistent-missing-override (Clang), headers from KConfig are
throwing a lot of warnings.

REVIEW: 122539





With -Winconsistent-missing-override (Clang), headers from KConfig are
throwing a lot of warnings.

REVIEW: 122539







Update installation variables.
2015-01-10T17:46:20+00:00

Alex Merry
alex.merry@kde.org

2015-01-10T17:46:20+00:00

23d21437af6c38673c3fcfb6d7ae45e8220f3406












Fix KCoreConfigSkeleton when toggling a value with saves in between
2015-01-06T23:55:00+00:00

Albert Astals Cid
aacid@kde.org

2015-01-06T23:54:10+00:00

257b66e049483d198723e515c3c1e65e18b6afb3

REVIEW: 121838
Acked by Matthew Dawson





REVIEW: 121838
Acked by Matthew Dawson







Simplify condition, endsWith is clever enough.
2014-12-25T09:01:52+00:00

David Faure
faure@kde.org

2014-12-25T09:01:52+00:00

dd68b161108997073fd1e47a75c3309a502f8ea0