GitLab

CCBUG: 422095

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"

Daniel Vrátil authored Nov 04, 2020 and Laurent Montel committed Nov 05, 2020

Builds fine and currently we don't have 2.3.0 on Windows

Daniel Vrátil authored Nov 04, 2020 and Laurent Montel committed Nov 05, 2020

This fails on platforms where access specifiers are part of the ABI (e.g. MSVC)
because the symbol name generated from the included header is then different from
the symbol exported from the DLL.

Daniel Vrátil authored Nov 04, 2020 and Laurent Montel committed Nov 05, 2020

MSVC doesn't like when the same symbol appears in the executable as well
as in the linked library. Since the symbol is experted, there's no need
to explicitly build the CPP file as part of the test.

Daniel Vrátil authored Nov 02, 2020 and Daniel Vrátil committed Nov 03, 2020

The code is restored from some older revision where it still
existed. Somehow it got lost over time, and since the handler
wasn't registered either the compiler completely ignored the
class so it did not complain.

FIXED-IN: 5.15.3
BUG: 391030

FIXED-IN: 5.15.3
BUG: 427792