GitLab

(cherry picked from commit c789b727)

See https://phabricator.kde.org/T12200

Reproducible segfault when leaving statistics main window with unsaved
changes and clicking on save in the query dialog.
The segfault is thrown by KEduVocDocument pointer access which was
deleted before during destruction of StatisticsMainWindow. Both document
and widget are destructed by deleteLater. With the conditions mentioned
above the order of destruction becomes to the document deleted first
which leads to the segfault.
The fix is done by changing the pointer for KEduVocDocument to a shared
pointer which was not deleted until the last using class is deleted.

BUG: 420302

(cherry picked from commit 57f70810)

(cherry picked from commit fdd9d400)

(cherry picked from commit f1b21075)

The whole concept is almost unused and there's no point in having it there but empty

See also https://phabricator.kde.org/T13553

(cherry picked from commit d5af26f2)

(cherry picked from commit 62951640)

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"

BUG: 423903

(cherry picked from commit 6486a84e)

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"