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"

Orgad Shaneh authored Nov 29, 2018 and Albert Astals Cid committed Nov 29, 2018

Subscribers: yurchor, aacid, weidendo

Differential Revision: https://phabricator.kde.org/D16759

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"

To hide QTreeView colums, KCachegrind always used to set
the corresponding column widths to 0. However, this
does not work on recent Qt versions which enforce a
minimum column width by default (ie. columns stay visible).

So better use the correct way of hiding a column by
calling setColumnHidden(). This also should work for
old Qt versions.

Change {Call|Instr|Source}View accordingly.

"objdump" is called to disassemble code from an object file
for showing machine code in the instruction view.
To e.g. support "objdump" from LLVM or on MacOS, or to change
shown x86 instruction format from AT&T to Intel, the template
string for calling "objdump" can be changed by setting
the OBJDUMP_FORMAT environment variable.

If not set, the command format defaults to
  "objdump  -C -d --start-address=0x%1 --stop-address=0x%2 %3"

Before execution, the following strings will be replaced:
   %1 with hex start address
   %2 with hex end address
   %3 with name of object file

As the "objdump" command on MacOS (from LLVM) does not support "-C"
to ask for demangling of C++ symbols, OBJDUMP_FORMAT needs to be
set to "objdump -d --start-address=0x%1 --stop-address=0x%2 %3".

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"

# Conflicts:
#	kcachegrind/org.kde.kcachegrind.appdata.xml

was missing the `e` of `cache`