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"

fixes on high dpi
BUG:353760

CHANGELOG: Application Dashboard now closes when opening its settings not to conceal them

REVIEW: 125817

REVIEW: 125826

CHANGELOG: Pressing the back button on a mouse now goes up a level in Kickoff's application view

BUG: 353971
FIXED-IN: 5.4.3
REVIEW: 125822

Someone whilst porting had simply commented it out
This causes the install dialog to freeze if there's a problem.

CCBUG: 344473
CCBUG: 300951
CCBUG: 345234
REVIEW: 125555

REVIEW: 125820

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"

Since QT5.6, qpixmap.h pulls in qtextstream.h. Xlib.h has a
but qtextstream.h uses Status as an enum name. fixx11h.h resolves this
name clash.

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"

- Activities have more contextual information
- Configuration and activity creation interface is the same as in
  activities KCM
- Fixed the issue of plasma locking when Qt decides
  will-I-won't-I (the relayout loop when it decides whether to
  show a scroll-bar or not)

REVIEW:125626

Unlike QIconItem, IconItem can use SVG icons from Plasma theme.

REVIEW: 125660

Same fix as 1794d3c43f in plasma-framework.

BUG:353752

* Fix handling of all/all and all/allfiles MIME types.
* Change the default MIME type filter list to all/all, so that when
  switching to "Show Files Matching" the user doesn't need to take
  additional steps.
* Fix two cases in which the model didn't signal prop changes to
  drive the Apply button state correctly.

BUG:353409

Prevents just-launched applications from interfering with the
Dashboard when the user immediately wants to use it again.

BUG:352297

Also migrate from invoking a slot to a lambda

CHANGELOG: Context menus in the task manager applet are now aligned to the respective entry

REVIEW: 125589

This way we can also ensure the checked state properly resets when the panelcontroller
closes without the user dismissing the more menu first

From the docs:
This is dangerous, because when an event loop is entered in a signal
handler or binding, the QML engine continues to run other bindings,
animations, transitions, etc. Those bindings can then cause side effects
which, for example, destroy the hierarchy containing your event loop.

BUG: 347997
REVIEW: 125545

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"

REVIEW: 125402

GIT_SILENT

This removes the check if user has restore session on start option
enabled, so the layout map is restored everytime.

It also checks in LayoutMemory::laoutChanged if the changed keyboard
layout is different from user configured to prevent clearing the layout
map on startup.

BUG: 325572
FIXED-IN: 5.4.2
REVIEW: 125256

There's been repeated feedback they're too wide by default.

BUG:351425
CCBUG:353337