Commits · master · Plasma / KHotkeys

13 May, 2021 4 commits
- Update version number for 5.22.80 · fc9bf564
  Jonathan Riddell authored May 13, 2021
```
GIT_SILENT
```
  fc9bf564
- Migrate to KDECompilerSettings · 9f7e38b8
  David Edmundson authored May 13, 2021
  
  9f7e38b8
- Update version number for 5.21.90 · ea24a1f6
  Jonathan Riddell authored May 13, 2021
```
GIT_SILENT
```
  ea24a1f6
- Update kf5 version requirement to 5.82 · 90cd9a61
  Jonathan Riddell authored May 13, 2021
```
GIT_SILENT
```
  90cd9a61
03 May, 2021 1 commit
- GIT_SILENT Add auto generated files to .gitignore · 02caef43
  Alexander Lohnau authored May 03, 2021
  
  02caef43
08 Apr, 2021 1 commit
- GIT_SILENT Add auto generated files to .gitignore · d3c119e1
  Alexander Lohnau authored Apr 08, 2021
  
  d3c119e1
27 Mar, 2021 1 commit

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

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

65890d95

15 Mar, 2021 1 commit

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

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

93a03762

12 Mar, 2021 1 commit
- Use configure_package_config_file instead of ecm_configure_package_config_file · 17be05b5
  Nicolas Fella authored Mar 12, 2021
```
The difference is only relevant for ancient CMake versions
```
  17be05b5
04 Mar, 2021 1 commit

Raise minimum CMake version to 3.16 · f065489e

Nicolas Fella authored Mar 04, 2021

As discussed in https://mail.kde.org/pipermail/plasma-devel/2021-February/119329.html

GIT_SILENT

f065489e

21 Feb, 2021 1 commit

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

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

63ef0b6a

08 Feb, 2021 1 commit
- GIT_SILENT: don't use deprecated cmake variable · b3b88200
  Laurent Montel authored Feb 08, 2021
  
  b3b88200
30 Jan, 2021 1 commit
- Use versionless Qt cmake target · d4d9c45b
  Nicolas Fella authored Jan 30, 2021
```
This makes it easier to build against both Qt5 and Qt6

GIT_SILENT
```
  d4d9c45b
29 Jan, 2021 1 commit
- GIT_SILENT: dont use deprecated cmake variable · 1be504c6
  Laurent Montel authored Jan 29, 2021
  
  1be504c6
21 Jan, 2021 10 commits
- Add pre-commit hook for clang-format · 26776168
  Alexander Lohnau authored Jan 21, 2021
  
  26776168
- Update .gitignore · 647fd8f1
  Alexander Lohnau authored Jan 21, 2021
  
  647fd8f1
- Add .git-blame-ignore-revs file · 8fa865dd
  Alexander Lohnau authored Jan 21, 2021
  
  8fa865dd
- Run clang-format · 0810ac5b
  Alexander Lohnau authored Jan 21, 2021
```
If you want git blame to ignore formatting revisions run:
git config blame.ignoreRevsFile .git-blame-ignore-revs
```
  0810ac5b
- Add trailing commas to enums · c39d7ba5
  Alexander Lohnau authored Jan 21, 2021
  
  c39d7ba5
- Update version number for 5.21.80 · aef85bdc
  Jonathan Riddell authored Jan 21, 2021
```
GIT_SILENT
```
  aef85bdc
- Use xtest also for sending input to the active window · 5fcbd27a
  Fabian Vogt authored Jul 10, 2020
```
This is possible with xtest as well and necessary to work with applications
which don't accept synthetic events, like those using XInput2 (GTK3, Firefox)
```
  5fcbd27a
- Handle modifier keys with xtest in ShortcutsHandler::send_macro_key · ba10e042
  Fabian Vogt authored Jul 10, 2020
```
Otherwise the currently pressed modifiers are used.
This is especially an issue for global shortcuts, as those are most likely
activated with pressed modifiers.
```
  ba10e042
- Update kf5 version requirement to 5.78 · 57175658
  Jonathan Riddell authored Jan 21, 2021
```
GIT_SILENT
```
  57175658
- Update version number for 5.20.90 · 1111a300
  Jonathan Riddell authored Jan 21, 2021
```
GIT_SILENT
```
  1111a300
20 Jan, 2021 2 commits
- Fix unterminated SPDX comments after last commit, fixes build · 3c6a40d5
  Andreas Hartmetz authored Jan 20, 2021
  
  3c6a40d5
- Convert copyright statements to SPDX expressions · d97f133d
  David Redondo authored Oct 24, 2020
  
  d97f133d
08 Jan, 2021 1 commit

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

Script Kiddy authored Jan 08, 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"

d72d6d98

18 Dec, 2020 1 commit

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

Script Kiddy authored Dec 18, 2020

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"

d91ddb3c

16 Dec, 2020 1 commit
- Add .gitignore file to ignore generated .clang-format · 8e9cae8e
  Daan De Meyer authored Dec 16, 2020
  
  8e9cae8e
10 Dec, 2020 1 commit

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

Script Kiddy authored Dec 10, 2020

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"

e3c56cb8

07 Dec, 2020 1 commit

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

Script Kiddy authored Dec 07, 2020

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"

e7aa0a12

29 Nov, 2020 1 commit

Drop unused KF5Plasma dependency · 5f622844

Andreas Sturmlechner authored Nov 29, 2020

This had been already dropped in commit 1d60f46f, which was reverted in
commit 8ba8a29c

. At least that part of it was correct though.
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

5f622844

18 Nov, 2020 1 commit

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

Script Kiddy authored Nov 18, 2020

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"

ebc3c0f9

13 Nov, 2020 1 commit

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

Script Kiddy authored Nov 13, 2020

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"

2e997a02

09 Nov, 2020 2 commits

Fix import of files · 53ef605b
David Redondo authored Nov 09, 2020
```
QStandardPaths does not support wildcards
BUG:428536
```
53ef605b

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

Script Kiddy authored Nov 09, 2020

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"

5633eb39

24 Oct, 2020 2 commits
- Do not explicitly define Exec line for KCM · 18fc848a
  Alexander Lohnau authored Oct 24, 2020
```
See frameworks/kservice!16

CCBUG: 398803
```
  18fc848a
- SVN_SILENT made messages (.desktop file) - always resolve ours · dbb61389
  Script Kiddy authored Oct 24, 2020
```
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"
```
  dbb61389
23 Oct, 2020 2 commits
- If include is define in .h remove it if it's defined in .cpp too (scripted) · 260ea7a9
  Laurent Montel authored Oct 23, 2020
  
  260ea7a9
- SVN_SILENT made messages (.desktop file) - always resolve ours · 5c2c534e
  Script Kiddy authored Oct 23, 2020
```
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"
```
  5c2c534e