GitLab

(cherry picked from commit 6d64e62d)

(cherry picked from commit 6ca5c82c)

Calvin Buckley authored Oct 23, 2020 and Josef Weidendorfer committed Nov 30, 2021

Use the bundle ID specified in qcgmain.cpp; they should match to
avoid confusion. Separated out of !11.

findBreak() previously mixed QFontMetrics::boundingRect().width() (the
width a string takes up, including left/right overhangs) and
QFontMetrics::horizontalAdvance() (which excludes overhangs). This
resulted in inconsistent behaviors within the function.

For borderline strings where fm->boundingRect(text).width() >= maxWidth
but fm->horizontalAdvance(text) < maxWidth, the code would not return
early, and would never exit the binary search loop because halfWidth <
maxWidth even when halfPos == text.length(). In fact, bottomPos gets set
to text.length() + 1 and the loop continues forever.

By consistently using QFontMetrics::boundingRect().width(), we make sure
the binary search loop always breaks out. It would be nice to add a
(halfWidth < maxWidth && halfPos < breakPos) check, but it's not
strictly necessary.

BUG: 428917

(cherry picked from commit b4abebac)

(cherry picked from commit fb02f5e7)

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"

(cherry picked from commit 1b05d23d)

(cherry picked from commit bea566b7)

(cherry picked from commit 76a73d98)

(cherry picked from commit 3ce98282)

(cherry picked from commit 8ba03a5e)

(cherry picked from commit 445fd436)

Allow qcachgrind to compile both with Qt5 and Qt6.
This only changes code which used API already long
deprecated in Qt5 - no need to raise minimum Qt5.3

(cherry picked from commit 014dbadf)

(cherry picked from commit fbf284b2)

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 8053a23d)

GIT_SILENT

GIT_SILENT

Also add/move license files as required by REUSE specification

GIT_SILENT

Last version with LGPL 2.1

NO_CHANGELOG

(cherry picked from commit 1d45d03c)

Calvin Buckley authored Oct 29, 2020 and Albert Astals Cid committed Nov 06, 2020

User testing shown that this wasn't obvious. When the user adds the
first item (usually for all objects), open the dialog to make it
obvious, otherwise they tend to stumble around looking for more
options. For more items, it won't do this because it's assumed
that it's for different objects. (My testing with users didn't involve
programs with object files though.)

Can be replicated with KCG.

Calvin Buckley authored Sep 21, 2020 and Albert Astals Cid committed Nov 06, 2020

If the top-level window that last installed the dock died, then the
dock menu would be last. When a window dies, it should pass the torch
to another window that's still active.