Commits · master · Games / libkdegames

05 Aug, 2020 1 commit

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

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

dc821929

29 Jul, 2020 1 commit

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

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

481b66c4

10 Jul, 2020 1 commit
- Use camelcase include (scripted) · d43631c1
  Laurent Montel authored Jul 10, 2020
  
  d43631c1
18 Jun, 2020 12 commits
- Enforce modern Qt code · 17296740
  Friedrich W. H. Kossebau authored Jun 18, 2020
```
GIT_SILENT
```
  17296740
- Port away from deprecated QMap::uniqueKeys() · 87aa7a59
  Friedrich W. H. Kossebau authored Jun 18, 2020
```
m_customLevels not used as multi-value map, so keys() delivers the same

GIT_SILENT
```
  87aa7a59
- Less auto-cast from char to QChar · 0e83882c
  Friedrich W. H. Kossebau authored Jun 18, 2020
```
GIT_SILENT
```
  0e83882c
- Less auto-cast from QByteArray to const char* · dc485d30
  Friedrich W. H. Kossebau authored Jun 18, 2020
```
GIT_SILENT
```
  dc485d30
- Use Q_EMIT instead of emit · a98250f6
  Friedrich W. H. Kossebau authored Jun 18, 2020
```
GIT_SILENT
```
  a98250f6
- Use Q_SLOTS instead of slots · 7009b2f0
  Friedrich W. H. Kossebau authored Jun 18, 2020
```
GIT_SILENT
```
  7009b2f0
- Port away from foreach · 0c04db84
  Friedrich W. H. Kossebau authored Jun 18, 2020
```
GIT_SILENT
```
  0c04db84
- Port away from deprecated QAbstractSocket::error(SocketError) signal · 0f903168
  Friedrich W. H. Kossebau authored Jun 18, 2020
```
GIT_SILENT
```
  0f903168
- Use nullptr · 40cb35fa
  Friedrich W. H. Kossebau authored Jun 18, 2020
```
GIT_SILENT
```
  40cb35fa
- Remove another enable_testing(), already done by KDECMakeSettings · f406346c
  Friedrich W. H. Kossebau authored Jun 18, 2020
```
GIT_SILENT
```
  f406346c
- Also add BUILD_TESTING condition in subdir · f73b5765
  Andreas Sturmlechner authored Jun 17, 2020
```
Follow-up to 02679f6d.
```
  f73b5765
- SVN_SILENT made messages (.desktop file) - always resolve ours · 820336cd
  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"
```
  820336cd
17 Jun, 2020 1 commit

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

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

6d1cf390

01 Jun, 2020 4 commits
- Minor fixes to toplevel CMakeLists.txt · 02679f6d
  Friedrich W. H. Kossebau authored Jun 01, 2020
```
GIT_SILENT
```
  02679f6d
- Remove explicit use of ECM_KDE_MODULE_DIR, is part of ECM_MODULE_PATH · 4649341e
  Friedrich W. H. Kossebau authored Jun 01, 2020
```
GIT_SILENT
```
  4649341e
- metainfo.yaml: fix cmakename · 4f72b1c7
  Friedrich W. H. Kossebau authored Jun 01, 2020
```
GIT_SILENT
```
  4f72b1c7
- Support API documentation generation with kapidox · 21e01cef
  Friedrich W. H. Kossebau authored Jun 01, 2020
  
  21e01cef
20 May, 2020 2 commits
- GIT_SILENT: add Games icon as repository logo · 76bef805
  Yuri Chornoivan authored May 20, 2020
  
  76bef805
- GIT_SILENT: we don't use phabricator anymore · 3612d6b4
  Laurent Montel authored May 20, 2020
  
  3612d6b4
06 Apr, 2020 1 commit

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

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

ae14c251

28 Mar, 2020 1 commit
- GIT_SILENT: ignore .cmake generated by qtc · 169abad4
  Laurent Montel authored Mar 28, 2020
  
  169abad4
19 Mar, 2020 1 commit
- Add missing includes · 043d6a24
  Laurent Montel authored Mar 19, 2020
  
  043d6a24
09 Mar, 2020 1 commit
- Merge remote-tracking branch 'origin/release/19.12' · 033263ba
  Albert Astals Cid authored Mar 10, 2020
  
  033263ba
19 Feb, 2020 2 commits
- Fix compilation with Qt 5.15 · 9ac419d1
  David Faure authored Feb 19, 2020
```
We shouldn't have these in stable branches...

CCMAIL: montel@kde.org
```
  9ac419d1
- Fix using 0 for a flags · 6bb91961
  Laurent Montel authored Dec 03, 2019
```
(cherry picked from commit aaa34ec4)
```
  6bb91961
14 Dec, 2019 1 commit
- GIT_SILENT: remove <QtTest> which includes all of <QtCore> · 594a42cf
  Laurent Montel authored Dec 14, 2019
  
  594a42cf
12 Dec, 2019 3 commits
- Fix minor EBN issues (explicit) · 60686d10
  Yuri Chornoivan authored Dec 12, 2019
  
  60686d10
- Update link to OpenAL page · c1a62bfc
  Yuri Chornoivan authored Dec 12, 2019
  
  c1a62bfc
- Fix include guard to make EBN happy · 5c7e0b79
  Yuri Chornoivan authored Dec 12, 2019
  
  5c7e0b79
03 Dec, 2019 1 commit
- Fix using 0 for a flags · aaa34ec4
  Laurent Montel authored Dec 03, 2019
  
  aaa34ec4
08 Nov, 2019 1 commit
- Fix minor typos · d4bbaaa2
  Yuri Chornoivan authored Nov 08, 2019
  
  d4bbaaa2
04 Nov, 2019 1 commit
- GIT_SILENT: use flag only in source from git repo · 25b8774b
  Laurent Montel authored Nov 04, 2019
  
  25b8774b
23 Oct, 2019 1 commit

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

Script Kiddy authored Oct 23, 2019

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"

0b2ec5ed

22 Oct, 2019 1 commit
- Make it compile without kf5 deprecated method · 6352e92e
  Laurent Montel authored Oct 22, 2019
  
  6352e92e
18 Oct, 2019 1 commit
- Add version too · f90f31af
  Laurent Montel authored Oct 18, 2019
  
  f90f31af
19 Sep, 2019 1 commit
- Make it compile without deprecated method · 30e7003f
  Laurent Montel authored Sep 19, 2019
  
  30e7003f
06 Sep, 2019 1 commit
- Use STL equivalent of deprecated qCopy · bcbd4480
  Yuri Chornoivan authored Sep 06, 2019
  
  bcbd4480