Commits · a059d55cc231840a9e8a87562bfdef01b3e3b4b4 · Plasma / Plymouth KCM

27 Jun, 2022 2 commits
- Update qt5 version requirement to 5.15.2 · a059d55c
  Jonathan Esk-Riddell authored Jun 27, 2022
```
GIT_SILENT
```
  a059d55c
- Update kf5 version requirement to 5.94 · 3f20764c
  Jonathan Esk-Riddell authored Jun 27, 2022
```
GIT_SILENT
```
  3f20764c
15 Jun, 2022 1 commit
- Request passing unit tests on Linux and BSD · acdad846
  David Edmundson authored Jun 15, 2022
  
  acdad846
13 Jun, 2022 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 5bd6bef3

Script Kiddy authored Jun 13, 2022

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"

5bd6bef3

12 Jun, 2022 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · e112b806

Script Kiddy authored Jun 12, 2022

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"

e112b806

09 Jun, 2022 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 3293dd9c

Script Kiddy authored Jun 09, 2022

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"

3293dd9c

30 May, 2022 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 0d69a9c5

Script Kiddy authored May 30, 2022

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"

0d69a9c5

28 May, 2022 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 55957962

Script Kiddy authored May 28, 2022

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"

55957962

19 May, 2022 2 commits
- Update version number for 5.25.80 · cfc52918
  Jonathan Esk-Riddell authored May 19, 2022
```
GIT_SILENT
```
  cfc52918
- Update version number for 5.24.90 · 508e7dc2
  Jonathan Esk-Riddell authored May 19, 2022
```
GIT_SILENT
```
  508e7dc2
24 Apr, 2022 1 commit
- Use non-deprecated KAuth includes · acfd52dd
  Volker Krause authored Apr 24, 2022
```
Needed to build with KF deprecation level 5.92 or above.
```
  acfd52dd
10 Apr, 2022 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · a53aaee8

Script Kiddy authored Apr 10, 2022

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"

a53aaee8

08 Apr, 2022 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 4eaa9b48

Script Kiddy authored Apr 08, 2022

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"

4eaa9b48

29 Mar, 2022 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 57f307c3

Script Kiddy authored Mar 29, 2022

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"

57f307c3

23 Mar, 2022 1 commit

substantially bump the helper timeout · 2072c976

Harald Sitter authored Mar 22, 2022

its running time entirely depends on how fast the initrds are
to generate and how many there are. 60 seconds may not be nearly
enough.

BUG: 400641

2072c976

21 Feb, 2022 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · e6af9c27

Script Kiddy authored Feb 21, 2022

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"

e6af9c27

09 Feb, 2022 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · a87b81a1

Script Kiddy authored Feb 09, 2022

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"

a87b81a1

05 Feb, 2022 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 7b4225e0

Script Kiddy authored Feb 05, 2022

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"

7b4225e0

31 Jan, 2022 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · c69eb822

Script Kiddy authored Jan 31, 2022

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"

c69eb822

28 Jan, 2022 3 commits
- Add CI qt6 support · 93b3a4e2
  Laurent Montel authored Jan 28, 2022
  
  93b3a4e2
- Remove unused cmake variable · 0f6a1f5a
  Laurent Montel authored Jan 28, 2022
  
  0f6a1f5a
- Make it compile against qt6 · b3a42719
  Laurent Montel authored Jan 28, 2022
  
  b3a42719
17 Jan, 2022 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · c323acc9

Script Kiddy authored Jan 17, 2022

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"

c323acc9

16 Jan, 2022 1 commit

Add missing explicit exec line to KCM desktop file · 41778172

Alexander Lohnau authored Jan 16, 2022

With `Type=Application`, we need to specify this explicitly.
Before KService would internally set the exec value.

41778172

14 Jan, 2022 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · bde499a0

Script Kiddy authored Jan 14, 2022

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"

bde499a0

13 Jan, 2022 2 commits
- Update version number for 5.24.80 · c27cfb20
  Jonathan Esk-Riddell authored Jan 13, 2022
```
GIT_SILENT
```
  c27cfb20
- Update version number for 5.23.90 · 68158a90
  Jonathan Esk-Riddell authored Jan 13, 2022
```
GIT_SILENT
```
  68158a90
05 Jan, 2022 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 4b367c26

Script Kiddy authored Jan 05, 2022

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"

4b367c26

03 Jan, 2022 2 commits

refactor update-alternatives install into a helper function · 9ce5c7e5
Harald Sitter authored Dec 15, 2021
```
cuts down on code duplication
```
9ce5c7e5

fix update-alternatives checking · 930f705b

Harald Sitter authored Dec 15, 2021

this now lives in bin. indeed we don't care where it lives so long as
it is in path. consequently let's check via QSP

also stop repeating the literal all over the place, use a helper function
for the executable name

930f705b

02 Jan, 2022 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · f5516116

Script Kiddy authored Jan 02, 2022

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"

f5516116

30 Dec, 2021 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 1e9ab17b

Script Kiddy authored Dec 30, 2021

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"

1e9ab17b

26 Dec, 2021 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 87f8af87

Script Kiddy authored Dec 26, 2021

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"

87f8af87

15 Dec, 2021 2 commits

Use Q_EMIT here · 06e060ed
Laurent Montel authored Dec 15, 2021

06e060ed

modernzie code a tad · 41207acd

Harald Sitter authored Dec 15, 2021

- don't }else{} after returns
- don't stream into qstringlists, use init lists
- scope variables to blocks where possible
- use any_of and chrono literals to make code more legible
- more constness

41207acd

14 Dec, 2021 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 60039d7e

Script Kiddy authored Dec 14, 2021

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"

60039d7e

13 Dec, 2021 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 0f849389

Script Kiddy authored Dec 13, 2021

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"

0f849389

12 Dec, 2021 2 commits
- Fix clazy warnings · e79e0adb
  Laurent Montel authored Dec 12, 2021
  
  e79e0adb
- GIT_SILENT: it compiles fine without deprecated method · 8b4aecb0
  Laurent Montel authored Dec 12, 2021
  
  8b4aecb0
10 Dec, 2021 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 4f0c914f

Script Kiddy authored Dec 10, 2021

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"

4f0c914f