l10n daemon script
07b9872518
GIT_SILENT made messages (after extraction)
4 years ago
Heiko Becker
f9e78b9253
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 6bc195446d )
4 years ago
l10n daemon script
9df4986183
SVN_SILENT made messages (.desktop file) - always resolve ours
...
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"
4 years ago
Harald Sitter
8870f6074f
alias generator desktop files
...
this allows UIs to know that this is really okular and may show okular
instead (considering the generators are nodisplay=true)
specifically this allows the xdg-desktop-portal-kde to show okular in
its appchooser dialog even though the actual mimetype match happend
against (e.g.) okularApplication_pdf.desktop and is NoDisplay
(mobile curious has inconsistent naming, the main desktop file is
definitely org.kde.okular.kirigami.desktop)
4 years ago
l10n daemon script
3d085787ea
SVN_SILENT made messages (.desktop file) - always resolve ours
...
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"
4 years ago
l10n daemon script
d17b4ab2e9
SVN_SILENT made messages (.desktop file) - always resolve ours
...
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"
4 years ago
l10n daemon script
559c274f3a
SVN_SILENT made messages (.desktop file) - always resolve ours
...
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"
4 years ago
l10n daemon script
b910edafb6
SVN_SILENT made messages (.desktop file) - always resolve ours
...
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"
4 years ago
l10n daemon script
1626b59fef
SVN_SILENT made messages (.desktop file) - always resolve ours
...
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"
4 years ago
l10n daemon script
06612d93f0
SVN_SILENT made messages (.desktop file) - always resolve ours
...
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"
4 years ago
l10n daemon script
dfe316c6ec
SVN_SILENT made messages (.desktop file) - always resolve ours
...
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"
4 years ago
Heiko Becker
6ad408cd66
GIT_SILENT Update Appstream for new release
4 years ago
l10n daemon script
c823af787b
SVN_SILENT made messages (.desktop file) - always resolve ours
...
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"
4 years ago
l10n daemon script
a1d0b42a7f
SVN_SILENT made messages (.desktop file) - always resolve ours
...
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"
4 years ago
Heiko Becker
be0f1090ae
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 3144226af6 )
4 years ago
Heiko Becker
3144226af6
GIT_SILENT Update Appstream for new release
4 years ago
l10n daemon script
7cd0d78b5c
SVN_SILENT made messages (.desktop file) - always resolve ours
...
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"
4 years ago
Heiko Becker
715b8707b5
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 172f4edeae )
4 years ago
Heiko Becker
172f4edeae
GIT_SILENT Update Appstream for new release
4 years ago
Albert Astals Cid
0d40301d50
Add a few definitions that will come with ECM 5.85
...
Better enforce them now, so that the work to port doesn't increase over
time
Not a super fan of this for regular applications, but oh well the ship
has sailed
4 years ago
Albert Astals Cid
252236d413
Port a few more QLinkedList to QList
...
We don't need the special properties of QLinkedList in any of those and
QLinkedList is deprecated, so move away from it
4 years ago
Albert Astals Cid
dbcda67ab9
Fix opening CHM files on Windows
...
This is part of 451985 the other part is that KF5.91 windows build of
khtml was broken, seems the 5.92 one is good, so once we release 22.04.0
it should be all good hopefully.
BUGS: 451985
4 years ago
Albert Astals Cid
6747e7fe8b
signals-> Q_SIGNALS
...
A future ECM update is going to force that on us, so do it now anyway
4 years ago
Albert Astals Cid
a2e1043149
slots -> Q_SLOTS
...
A future ECM update is going to force that on us, so do it now anyway
4 years ago
Albert Astals Cid
ba35bbd9e6
emit -> Q_EMIT
...
A future ECM is going to force that on us, so do it early
4 years ago
Volker Krause
50d0703ae0
Enable readability-braces-around-statements
4 years ago
Heiko Becker
fe5847155c
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit b2d872c79f )
4 years ago
l10n daemon script
9cdc390f53
SVN_SILENT made messages (.desktop file) - always resolve ours
...
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"
4 years ago
l10n daemon script
5115d6db24
SVN_SILENT made messages (.desktop file) - always resolve ours
...
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"
4 years ago
Heiko Becker
db9dd90925
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 715fd1ac36 )
4 years ago
Heiko Becker
715fd1ac36
GIT_SILENT Update Appstream for new release
4 years ago
Heiko Becker
11448b94b1
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 8a09492a9a )
4 years ago
Heiko Becker
8a09492a9a
GIT_SILENT Update Appstream for new release
4 years ago
Albert Astals Cid
84d977dd2d
GIT_SILENT Update Appstream for new release
4 years ago
Albert Astals Cid
09a2b506ed
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 84d977dd2d )
4 years ago
l10n daemon script
a520e4378b
SVN_SILENT made messages (.desktop file) - always resolve ours
...
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"
4 years ago
Heiko Becker
b5eebfa12d
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 2a00f650c5 )
4 years ago
Heiko Becker
458c72a9c3
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 4304bcc397 )
5 years ago
Heiko Becker
4304bcc397
GIT_SILENT Update Appstream for new release
5 years ago
l10n daemon script
84c9f3ea2a
SVN_SILENT made messages (.desktop file) - always resolve ours
...
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"
5 years ago
l10n daemon script
e6c6e52253
SVN_SILENT made messages (.desktop file) - always resolve ours
...
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"
5 years ago
l10n daemon script
9a4f79ff83
GIT_SILENT made messages (after extraction)
5 years ago
l10n daemon script
7c87c702df
SVN_SILENT made messages (.desktop file) - always resolve ours
...
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"
5 years ago
l10n daemon script
7ae4288f35
SVN_SILENT made messages (.desktop file) - always resolve ours
...
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"
5 years ago
l10n daemon script
f023cdc5b7
GIT_SILENT made messages (after extraction)
5 years ago
l10n daemon script
cc5849a6f8
SVN_SILENT made messages (.desktop file) - always resolve ours
...
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"
5 years ago
l10n daemon script
21f96680a6
SVN_SILENT made messages (.desktop file) - always resolve ours
...
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"
5 years ago
l10n daemon script
b022f98495
SVN_SILENT made messages (.desktop file) - always resolve ours
...
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"
5 years ago
l10n daemon script
6faaf727f6
SVN_SILENT made messages (.desktop file) - always resolve ours
...
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"
5 years ago
Albert Astals Cid
0c659a5466
clang-tidy: Enable google-explicit-constructor
5 years ago