kconfig.git, branch v5.17.0 hurd kconfig.git Commit translations from l10n-kf5 2015-12-06T21:19:09+00:00 l10n daemon script scripty@kde.org 2015-12-06T21:19:09+00:00 ddad196fd4e10bfde00ab5681a2ae4243ebc7caf 






Upgrade ECM and KF5 version requirements for 5.17.0 release.
2015-12-06T14:00:11+00:00

l10n daemon script
scripty@kde.org

2015-12-06T14:00:11+00:00

7d54bb02e1a907c5f270ec9903fc7196de9d56b3












Upgrade KF5 version to 5.17.0.
2015-12-06T08:20:41+00:00

l10n daemon script
scripty@kde.org

2015-12-06T08:20:41+00:00

48e68fda88e016149da031e827cbbd33c63af59f












SVN_SILENT made messages (.desktop file) - always resolve ours
2015-11-21T19:21:44+00:00

l10n daemon script
scripty@kde.org

2015-11-21T19:21:44+00:00

417c7300ef01cc3aa0d11f8e5506d365855019e2

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"







In KConfigTest::testEntryMap, convert QByteArray with nulls using a char *
2015-11-09T14:42:42+00:00

Matthew Dawson
matthew@mjdsystems.ca

2015-11-09T14:42:42+00:00

0f1e67051dae0c9b1f23461f7caed594795e8a27

Due to https://codereview.qt-project.org/#/c/106473/, Qt 5.6 keeps null
characters in QByteArray -> QString conversions, which breaks this test as
one QByteArray contains nulls.  Instead, convert the QByteArray to const
char * first, so QString stops at the first null.

The actual  behaviour of KConfig is unchanged, as internally the conversion
always went through a const char *, which avoids creating QStrings with
null characters.

REVIEW: 126001





Due to https://codereview.qt-project.org/#/c/106473/, Qt 5.6 keeps null
characters in QByteArray -> QString conversions, which breaks this test as
one QByteArray contains nulls.  Instead, convert the QByteArray to const
char * first, so QString stops at the first null.

The actual  behaviour of KConfig is unchanged, as internally the conversion
always went through a const char *, which avoids creating QStrings with
null characters.

REVIEW: 126001







Upgrade ECM and KF5 version requirements for 5.16.0 release.
2015-11-08T11:00:47+00:00

l10n daemon script
scripty@kde.org

2015-11-08T11:00:47+00:00

809e7156b21c5cecea68fc474d210d1068372ef9












SVN_SILENT made messages (.desktop file) - always resolve ours
2015-11-04T17:04:03+00:00

l10n daemon script
scripty@kde.org

2015-11-04T17:04:03+00:00

12399c3558a124bb3ba7e782842889c50043454d

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"







Fix usage of ecm_create_qm_loader.
2015-11-03T15:04:46+00:00

Alex Merry
alex.merry@kde.org

2015-11-03T15:04:46+00:00

19513e1910f19375a4c17a61f048c7f8c2f9e840

Generate-source-file macros should be used from the same CMakeLists.txt
file as the targets they generate files for.





Generate-source-file macros should be used from the same CMakeLists.txt
file as the targets they generate files for.







Use QStringLiteral in generated code
2015-10-30T22:31:09+00:00

Montel Laurent
montel@kde.org

2015-10-28T07:29:32+00:00

75d11cc64fee09189bfe8f968f0558e3d1000db8

REVIEW: 125833





REVIEW: 125833







Fix include variable
2015-10-27T01:29:05+00:00

Aleix Pol
aleixpol@kde.org

2015-10-27T01:29:05+00:00

91d0b11a87d7d547f204ce8d16baa710520f55ac