Heiko Becker
cffa20eeae
GIT_SILENT Update Appstream for new release
3 years ago
Albert Astals Cid
54faf31823
GIT_SILENT Update Appstream for new release
3 years ago
l10n daemon script
3f9a1aeb27
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"
3 years ago
Heiko Becker
6076431f4b
GIT_SILENT Update Appstream for new release
3 years ago
l10n daemon script
8b72dcb4b2
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"
3 years ago
l10n daemon script
adaef601ce
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"
3 years ago
l10n daemon script
a8a89b2d8c
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"
3 years ago
l10n daemon script
9579a4540f
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"
3 years ago
Heiko Becker
8119d903a3
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit b39a4d7fe2 )
3 years ago
l10n daemon script
804cadfb53
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
5fcb59011b
GIT_SILENT made messages (after extraction)
4 years ago
l10n daemon script
04059bae4b
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
db9f77543e
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 8cb15507fd )
4 years ago
Heiko Becker
8cb15507fd
GIT_SILENT Update Appstream for new release
4 years ago
Albert Astals Cid
4ad5753c3c
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit a0c6cb572a )
4 years ago
Albert Astals Cid
a0c6cb572a
GIT_SILENT Update Appstream for new release
4 years ago
l10n daemon script
0330558977
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
f0d3e6f047
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
7589278d35
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
7094ed0586
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
326d314677
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
946406d114
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
566687744e
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
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
Heiko Becker
6bc195446d
GIT_SILENT Update Appstream for new release
4 years ago
l10n daemon script
1852cc8513
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
b438b6bb0f
GIT_SILENT made messages (after extraction)
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
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
Heiko Becker
6ad408cd66
GIT_SILENT Update Appstream for new release
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
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
6767b8739e
Port a few QLinkedList to QList
...
QLinkedList is deprecated in later Qt5 and gone in Qt6
The 1:1 port is std::list but in this cases all we ever do
is create the lists, push back to them, and pass then around
to be read, for that a QList is more than enough
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
a2576dc746
Act on core/ TODOs that are not binary compatible
...
I'm going to need to break binary compatibility to add a new feature
so may as well cleanup all the TODOs regarding that
Changes:
* Moving a few destructors to the header
* Removing a few unnecessary & in params
* Adding a few necessary & in params
* Making print return an enum instead of a bool and then having another
function that returns the enum
* Make Generator::requestFontData be a virtual
* Remove unused enum
* Remove a few filePrinter unneeded functions
* Remove unused TextDocumentGenerator::addMetaData signal
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