GitLab

GIT_SILENT

GIT_SILENT

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"

`m_profileCombo` could be an invalid pointer, because when clicking an
item, `QAbstractItemView::clicked` and `QAbstractItemView::activated` in
systemsettings both will be emitted, and `IconMode::changeModule` will be
called twice, and `closeModules()` will free `m_profileCombo` in the
second call, which will crash systemsettings.

To fix the crash, set the watcher's parent to `m_profileCombo`, so when
`m_profileCombo` is destroyed, the watcher is also destroyed and the
connection is disconnected to prevent modification to the old `m_profileCombo`.

CCBUG: 443858

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"

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"

Accidentally removed in 927e16a6

Bhushan Shah authored Dec 11, 2021 and Bhushan Shah committed Dec 12, 2021

On ARM devices mainly it seems backlight devices does not have enabled
property at all, so do not treat failure to open file as a invalid
criteria for selecting if we should use backlight device

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"

This is now documented as the standard Linux kernel API for
charging thresholds:
https://github.com/torvalds/linux/blob/master/Documentation/ABI/testing/sysfs-class-power

This was added to the `thinkpad_acpi` driver in
https://github.com/torvalds/linux/commit/e33929537b76486d2ed576a0d9ce3ebff51bf851



And keep backward compatible code path for now.
Co-authored-by: Ian Douglas Scott <idscott@system76.com>

Dan Robinson authored Dec 03, 2021 and Nate Graham committed Dec 03, 2021

Check the enabled property on each backlight device before using
it as a backlight device, so the correct device is used in multi
GPU setups

BUG: 399646
FIXED-IN: 5.24

Passing in a nullptr has no effect anyways, so lets just
use the non-deprecated constructor

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"

There are certain aspects where we decide to use slightly different
settings for a tablety device (e.g. Plasma Mobile) and the rest. So far
this was getting set using the QT_QUICK_CONTROLS_MOBILE environment
variable, which makes it harder for us as it carries tons of graphical
connotations that we don't care for in here. Instead use KWin's
TabletMode, which fits much better what we are trying to do here.

This applies to:
- the power button configuration (on tablet it puts the device to sleep,
on non-tablet it shows the logout page)
- profile generation. Since profile generation is static, we'll use the
availability of the feature to decide how to generate it. This way the
device won't just start behaving completely different when it stops
acting as a tablet.

The timer isn't running when user chose "Do nothing" on critical battery

BUG: 445171
FIXED-IN: 5.23.4

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"

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"

Aleix Pol Gonzalez authored Oct 09, 2021 and Aleix Pol Gonzalez committed Oct 14, 2021

Do not issue the lock action until we have had enough time to dim the
display. Otherwise we make the whole workspace black and the user cannot
enjoy the dimming animation.

Closes teams/plasma-mobile/issues#61

GIT_SILENT

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"

BUG: 443114

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"

FreeBSD doesn't have sysfs, but it also isn't needed for backlight controls.

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"

This is a bad idea in general, causes the spinboxes here not to match in
width with other spinboxes elsewhere in the page, and breaks with the new
spinbox style in Plasma 5.23.

BUG: 442556
FIXED-IN: 5.23

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"

GIT_SILENT