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"

(cherry picked from commit 995b53af)

libk3bdevice/k3bcdtext.cpp:878: warning: comparison of integer
  expressions of different signedness: 'unsigned int' and 'int'
libk3bdevice/k3bcdtext.cpp:886: warning: comparison of integer
  expressions of different signedness: 'unsigned int' and 'int'

libk3bdevice/k3bdevice.cpp:793: warning: logical 'or' of equal expressions

plugins/decoder/mp3/k3bmad.h:74: warning: 'K3bMad::m_madStructuresInitialized'
  will be initialized after
plugins/decoder/mp3/k3bmad.h:67: warning: 'mad_stream* K3bMad::madStream'
plugins/decoder/mp3/k3bmad.cpp:15: warning: when initialized here

src/rip/k3bpatternparser.h:46: warning: 'void K3b::replaceControlCharacters(QString&)'
  declared 'static' but never defined

The error handling is disabled, so there is no need for the 'widget'
parameter (which was null anyway) or to connect to the jobError() signal.

Introduced by libkcddb commit fac5a809.

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"

By removing the two overloaded versions of K3bQProcess(),
which were never used.  This makes the library not BC and so
its major version is changed from 7 to 8.

As a result of commit 6b1b4d4b.

Therefore requiring Qt minimum version 5.14.

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"

Thou shall not override it here.

GIT_SILENT

KCoreAddons >= 5.90 changed the behaviour of where kcoreaddons_add_plugin()
puts the plugins .so files in the builddir, i.e. it doesn't use a plugins/
subdir any more. For details see [1].

Use <builddir>/bin/k3b_plugins instead, as builddir/bin/k3b is going to be
used for the app executable.

[1] frameworks/kcoreaddons@375e19cf

BUGS: 452594

CCBUG: 452594

(cherry picked from commit 8e11de91)

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"