GitLab

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 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 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"

This way it simplifies their cleanup, and avoid double deletions in
some (rare) cases.

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"

There is really no need to popup a message for that -- it will not be
useful to users anyway.

It makes DocEntry slightly smaller.

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: 351939

Create a new version of checkxrefs in Perl, which makes working with
data structures a bit easier than in shell... (and there is no need to
spawn executables all the time)

Also, add it as build time test, so it isn't forgotten anymore.

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"

Migrate mSearchFrame from QFrame to QWidget, since it does not use any
of what QFrame provides over QWidget; also change its name, since it is
not a frame anymore.

A simple layout with widgets in it is enough, no need for extra
widgets.  Also change the button in the button box, Close instead of
Ok.

Use <...> instead of "...".

Also decode it using the right encoding.

If ki18n >= 5.20.0 is available, use KLocalizedString::languages()
to get the list of configured languages for translations.
This fixes the lookup of translated content, such as TOCs, mirroring
what was done with commit 37bc9831fe097b01bb100f622ecd0ef19f77b80f in
kio.git.

- remove endl and '\n', since they are added automatically
- remove extra spaces
- remove extra quoting (done automatically for QString)
- raise some khcDebug to khcWarning, since they are not usual situations
- other general fixups

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"

- remove the double QTreeWidget vs QTreeWidgetItem behaviour by using
  only items (including the root of the tree) as parents
- keep track of the items created for each DocEntry, and reuse them as
  parents when iterating on the children of the DocEntry's: properly
  mark temporary items as such, eventually removing only them when
  empty

As related change, pass only the SearchEngine and not the whole
SearchWidget, since there is no real need for it.

as a consequence of the changes above, remove the supporting API no more
needed in SearchWidget and ScopeItem.

Use Prefs::showMissingDocs() directly where needed.

It does not need to be a class member, and thus createChildrenList can
be static now.

There is a (undocumented) configuration key that switches the search
for any handler to a preset program. However, there are different issues
with it:
- letting handlers to create their indexes as needed, but then not using
  them, makes no sense -- my blind guess is in that far past some distro
  used this to integrate with their own system, but I cannot find more
  hints about that
- the common program seems to behave like a CGI
- the internal implementation is synchronously in a buggy way (cfr
  bug #158282)
- it has not been tested nor used for a decade

Hence, just drop this implementation.
BUG: 158282

This sort of reverts commit 1e349d94,
since DocInfo uses Prefs again.