Commits · master · Plasma / KDE CLI tools

01 Jul, 2022 1 commit

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

Script Kiddy authored Jul 01, 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"

5d1ed28e

28 Jun, 2022 1 commit
- Fix DBus name for KPluginMetaData based KCMs · 19930486
  Alexander Lohnau authored Jun 28, 2022
```
BUG: 455943
FIXED-IN: 5.25.2
```
  19930486
27 Jun, 2022 2 commits
- Update qt5 version requirement to 5.15.2 · 158b860b
  Jonathan Esk-Riddell authored Jun 27, 2022
```
GIT_SILENT
```
  158b860b
- Update kf5 version requirement to 5.94 · 32016b31
  Jonathan Esk-Riddell authored Jun 27, 2022
```
GIT_SILENT
```
  32016b31
15 Jun, 2022 1 commit
- Request passing unit tests on Linux and BSD · 81bc9a70
  David Edmundson authored Jun 15, 2022
  
  81bc9a70
11 Jun, 2022 1 commit

Use cmakedefine01 · dc0c68a7

Ahmad Samir authored Jun 11, 2022

This way we get a build time warning if the var isn't defined at all, e.g.
a missing check_include_files() CMake call.

dc0c68a7

09 Jun, 2022 1 commit

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

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"

677da6ab

07 Jun, 2022 1 commit

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

Script Kiddy authored Jun 07, 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"

6ec55def

28 May, 2022 1 commit

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

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"

d428644a

22 May, 2022 1 commit
- Add missing include · 3c9509cf
  Volker Krause authored May 22, 2022
```
This is no longer implicitly included with KF deprecation level 5.94.
```
  3c9509cf
19 May, 2022 2 commits
- Update version number for 5.25.80 · 6e0ddcc8
  Jonathan Esk-Riddell authored May 19, 2022
```
GIT_SILENT
```
  6e0ddcc8
- Update version number for 5.24.90 · b6fb0fb8
  Jonathan Esk-Riddell authored May 19, 2022
```
GIT_SILENT
```
  b6fb0fb8
06 May, 2022 1 commit

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

Script Kiddy authored May 06, 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"

e3fdf1e7

30 Apr, 2022 1 commit

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

Script Kiddy authored Apr 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"

78789e32

25 Apr, 2022 1 commit

Disable more deprecated fallback code paths · 7259c78a

Volker Krause authored Apr 25, 2022

This allows building with KF deprecation level 5.92 or above, where we
don't have KPluginMetaData::fromDesktopFile anymore.

7259c78a

24 Apr, 2022 4 commits
- Wrap deprecated API usage KCMShell in deprecation wrappers · 6eb9c053
  Alexander Lohnau authored Apr 24, 2022
```
Task: https://phabricator.kde.org/T15468
```
  6eb9c053
- Qt::AA_UseHighDpiPixmaps is enabled by default in qt6 · 74fd1de7
  Laurent Montel authored Apr 24, 2022
  
  74fd1de7
- Remaining bits to build with Qt6 · f3f3863a
  Volker Krause authored Apr 23, 2022
```
Minor build system changes, QStringRef, QStringList forward declarations.
```
  f3f3863a
- Remove ktraderclient for 6 · b122ff95
  Volker Krause authored Apr 23, 2022
```
The underlying trader system is gone.
```
  b122ff95
23 Apr, 2022 2 commits
- Port from KMimeTypeTrader to KParts::PartLoader · 4cf80050
  Volker Krause authored Apr 23, 2022
```
The former is deprecated.
```
  4cf80050
- Start to adapt build system for building against qt6 · 4f334586
  Laurent Montel authored Apr 23, 2022
  
  4f334586
15 Apr, 2022 1 commit

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

Script Kiddy authored Apr 15, 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"

d350e17b

10 Apr, 2022 1 commit

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

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"

915661ae

05 Apr, 2022 1 commit

kioclient: improve the format of the usage/help message · fe0367ba

Ahmad Samir authored Jan 13, 2022

This also moves the parts of the texts that shouldn't be translated, i.e.
the actual command, to an arg in the i18n calls; more helpful for
translators.

fe0367ba

03 Apr, 2022 1 commit

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

Script Kiddy authored Apr 03, 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"

4894fb62

30 Mar, 2022 1 commit

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

Script Kiddy authored Mar 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"

63df2135

29 Mar, 2022 1 commit

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

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"

18402f8e

27 Mar, 2022 1 commit

plasma-open-settings: Support passing args as the path of the URL · 711fdd2f

Aleix Pol Gonzalez authored Mar 25, 2022

It gives us the possibility to better control how these settings get
called.

The resulting URL will be something like this:
systemsettings://kcm_keys/org.kde.konsole.desktop

711fdd2f

24 Mar, 2022 1 commit

Remove explicit QuickSettings init method call · 8415c2be

Alexander Lohnau authored Mar 24, 2022

This is now done as part of the plasma integration plugin.

Task: https://phabricator.kde.org/T12135

8415c2be

20 Mar, 2022 1 commit

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

Script Kiddy authored Mar 20, 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"

f66fa675

13 Mar, 2022 1 commit

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

Script Kiddy authored Mar 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"

8d6ef8c5

07 Mar, 2022 1 commit

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

Script Kiddy authored Mar 07, 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"

97781af7

05 Mar, 2022 1 commit

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

Script Kiddy authored Mar 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"

50e68589

01 Mar, 2022 1 commit

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

Script Kiddy authored Mar 01, 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"

69b46ede

23 Feb, 2022 1 commit

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

Script Kiddy authored Feb 23, 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"

910c3eb6

21 Feb, 2022 1 commit

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

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"

f0cca069

20 Feb, 2022 1 commit

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

Script Kiddy authored Feb 20, 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"

7df211e6

18 Feb, 2022 1 commit

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

Script Kiddy authored Feb 18, 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"

5fbaa72d

16 Feb, 2022 1 commit

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

Script Kiddy authored Feb 16, 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"

4137d84e

14 Feb, 2022 1 commit

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

Script Kiddy authored Feb 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"

fcaf565e