Commits · master · Plasma / Oxygen

13 May, 2021 3 commits
- Update version number for 5.22.80 · 85e6c9e8
  Jonathan Riddell authored May 13, 2021
```
GIT_SILENT
```
  85e6c9e8
- Update version number for 5.21.90 · 3183167f
  Jonathan Riddell authored May 13, 2021
```
GIT_SILENT
```
  3183167f
- Update kf5 version requirement to 5.82 · ba282283
  Jonathan Riddell authored May 13, 2021
```
GIT_SILENT
```
  ba282283
03 May, 2021 1 commit
- GIT_SILENT Add auto generated files to .gitignore · 60706eb2
  Alexander Lohnau authored May 03, 2021
  
  60706eb2
28 Apr, 2021 1 commit

Update oxygenbutton.cpp to keep toggle buttons glowing when being checked. · b2bfa036

Valentin Petzel authored Apr 28, 2021

When checking a toggle button it is hard to see the difference, as it is just an
inversion of the shading. Thus I suggest that the toggle buttons should keep glowing
when they are checked.

b2bfa036

27 Apr, 2021 1 commit
- Don't call BlurHelper::clear() for unregistered widgets · 8bd426db
  Vlad Zahorodnii authored Apr 27, 2021
```
BlurHelper::clear() will call QWidget::winId(), which may create a
toplevel window.

BUG: 435129
```
  8bd426db
15 Mar, 2021 1 commit

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

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"

458d196d

04 Mar, 2021 1 commit

Raise minimum CMake version to 3.16 · 9f8b4163

Nicolas Fella authored Mar 04, 2021

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

GIT_SILENT

9f8b4163

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

GIT_SILENT
```
  290624d1
29 Jan, 2021 1 commit
- GIT_SILENT: dont use deprecated cmake variable · 75b0d49e
  Laurent Montel authored Jan 29, 2021
  
  75b0d49e
24 Jan, 2021 1 commit

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

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

4325971b

21 Jan, 2021 3 commits
- Update version number for 5.21.80 · cf0157a7
  Jonathan Riddell authored Jan 21, 2021
```
GIT_SILENT
```
  cf0157a7
- Update kf5 version requirement to 5.78 · 5cac4bf0
  Jonathan Riddell authored Jan 21, 2021
```
GIT_SILENT
```
  5cac4bf0
- Update version number for 5.20.90 · c1b08336
  Jonathan Riddell authored Jan 21, 2021
```
GIT_SILENT
```
  c1b08336
16 Jan, 2021 1 commit

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

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

54452560

22 Dec, 2020 1 commit
- Port QRegExp to QRegularExpression · 561e46fa
  Ahmad Samir authored Dec 07, 2020
  
  561e46fa
10 Dec, 2020 1 commit
- operator+/- is disabled for QFlags in qt6 · bf30d178
  Laurent Montel authored Dec 10, 2020
  
  bf30d178
09 Dec, 2020 1 commit

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

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

c74576e2

23 Oct, 2020 1 commit
- If include is define in .h remove it if it's defined in .cpp too (scripted) · fb1d2c2f
  Laurent Montel authored Oct 23, 2020
  
  fb1d2c2f
19 Oct, 2020 1 commit

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

Script Kiddy authored Oct 19, 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"

101cc7d9

11 Oct, 2020 1 commit

[cursors] Add symlinks for corner resize · 832b09f5

Ismael Asensio authored Oct 11, 2020

Add missing symlinks for diagonal resize, named after the
geographical coordinates (ne, nw, se, sw), according to the
XDG spec:
https://www.freedesktop.org/wiki/Specifications/cursor-spec/

Otherwise, they will not show on certain situations, such as
window resize from corners

832b09f5

26 Sep, 2020 1 commit

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

Script Kiddy authored Sep 26, 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"

e9cdfa4a

21 Sep, 2020 1 commit
- Update version number for 5.20.80 · 6d7f4c80
  Bhushan Shah authored Sep 21, 2020
```
GIT_SILENT
```
  6d7f4c80
20 Sep, 2020 1 commit

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

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

f3341f9b

17 Sep, 2020 3 commits
- Update version number for 5.19.90 · 4e332a59
  Bhushan Shah authored Sep 17, 2020
```
GIT_SILENT
```
  4e332a59
- Update qt5 version requirement to 5.15.0 · 123a469f
  Bhushan Shah authored Sep 17, 2020
```
GIT_SILENT
```
  123a469f
- Update kf5 version requirement to 5.74 · 8eead2d8
  Bhushan Shah authored Sep 17, 2020
```
GIT_SILENT
```
  8eead2d8
16 Sep, 2020 1 commit
- Remove explicit ECM_KDE_MODULE_DIR · 8461c620
  Laurent Montel authored Sep 16, 2020
  
  8461c620
01 Sep, 2020 1 commit
- Port away from deprecated Qt::MidButton · efe64aca
  Laurent Montel authored Sep 01, 2020
  
  efe64aca
07 Aug, 2020 1 commit

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

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

3cacbed8

06 Aug, 2020 1 commit

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

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

31e1fd6d

30 Jul, 2020 3 commits
- Merge branch 'Plasma/5.19' · a839eeee
  Nate Graham authored Jul 30, 2020
  
  a839eeee
- SVN_SILENT made messages (.desktop file) - always resolve ours · cb3bcbde
  Script Kiddy authored Jul 30, 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"
```
  cb3bcbde
- SVN_SILENT made messages (.desktop file) - always resolve ours · 5ea0e14b
  Script Kiddy authored Jul 30, 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"
```
  5ea0e14b
28 Jul, 2020 1 commit
- Update version number for 5.19.4 · 615b296c
  Jonathan Riddell authored Jul 28, 2020
```
GIT_SILENT
```
  615b296c
07 Jul, 2020 1 commit
- Update version number for 5.19.3 · 5f5f0f37
  Jonathan Riddell authored Jul 07, 2020
```
GIT_SILENT
```
  5f5f0f37
23 Jun, 2020 1 commit
- Update version number for 5.19.2 · 0245bef4
  Jonathan Riddell authored Jun 23, 2020
```
GIT_SILENT
```
  0245bef4
18 Jun, 2020 2 commits

[style] Fix crash during app tear down sequence · c7c8a213

Vlad Zahorodnii authored May 21, 2020

We want to destroy a shadow after its decorated window has been destroyed
or unmapped. In order to do that, we install an event filter on the widget
and make the shadow a child of the window.

Unfortunately, the underlying window and the widget have different life
times. To ensure that _shadows has no dangling pointers, we will remove
the shadow when it's destroyed. The problem with doing so is that it will
invalidate iterators when ShadowHelper destroys all shadows during app
tear down, which will eventually result in a crash.

In order to keep iterators valid when ShadowHelper destroys shadows, we
need to clean up _shadows after the decorated window has been destroyed.

c7c8a213

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

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

25fe85e6