Commit graph

2595 commits

Author SHA1 Message Date
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"
2022-07-03 01:54:16 +00:00
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"
2022-07-02 01:59:30 +00:00
l10n daemon script
07b9872518 GIT_SILENT made messages (after extraction) 2022-07-02 00:44:24 +00:00
Heiko Becker
f9e78b9253 GIT_SILENT Update Appstream for new release
(cherry picked from commit 6bc195446d)
2022-07-01 21:37:09 +02:00
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"
2022-07-01 01:46:49 +00:00
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)
2022-06-17 17:37:10 +00:00
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"
2022-06-13 02:20:38 +00:00
l10n daemon script
a761a59630 GIT_SILENT made messages (after extraction) 2022-06-13 00:54:48 +00:00
Albert Astals Cid
12a222c950 Merge remote-tracking branch 'origin/release/22.04' 2022-06-09 11:21:35 +02:00
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"
2022-06-09 03:27:27 +00:00
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"
2022-06-09 02:00:18 +00:00
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"
2022-06-07 03:45:56 +00:00
l10n daemon script
4c57664483 GIT_SILENT made messages (after extraction) 2022-06-07 02:58:00 +00:00
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"
2022-06-07 02:06:15 +00:00
l10n daemon script
f0b94bee66 GIT_SILENT made messages (after extraction) 2022-06-07 00:47:37 +00:00
Heiko Becker
6ad408cd66 GIT_SILENT Update Appstream for new release 2022-06-04 10:27:58 +02:00
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"
2022-05-31 03:16:29 +00:00
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"
2022-05-31 01:55:33 +00:00
l10n daemon script
dbe951e103 GIT_SILENT made messages (after extraction) 2022-05-17 02:10:46 +00:00
l10n daemon script
8880077fe6 GIT_SILENT made messages (after extraction) 2022-05-17 00:43:26 +00:00
l10n daemon script
ad813d6667 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"
2022-05-13 02:49:57 +00:00
l10n daemon script
9b57bb847e GIT_SILENT made messages (after extraction) 2022-05-13 02:11:05 +00:00
l10n daemon script
e8d5f24ad4 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"
2022-05-13 01:44:03 +00:00
l10n daemon script
3001fcb88d GIT_SILENT made messages (after extraction) 2022-05-13 00:44:03 +00:00
l10n daemon script
c53a64c8da 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"
2022-05-09 02:50:27 +00:00
l10n daemon script
8805d1bde9 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"
2022-05-09 01:41:46 +00:00
Heiko Becker
be0f1090ae GIT_SILENT Update Appstream for new release
(cherry picked from commit 3144226af6)
2022-05-07 11:34:49 +02:00
Heiko Becker
3144226af6 GIT_SILENT Update Appstream for new release 2022-05-07 11:34:30 +02:00
Albert Astals Cid
8e311cf26d Fix logical mistake in 44304b32a5
ifndef feature means < when checking for feature not >=
2022-05-04 23:41:42 +02:00
Albert Astals Cid
44304b32a5 Use the poppler version includes instead of check_cxx_source_compiles 2022-05-04 01:16:35 +02:00
Daniel Novomeský
7c596be34a kimgio: enable JPEG XL format
BUG: 453131
2022-04-29 09:34:48 +00:00
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"
2022-04-14 01:42:53 +00:00
Heiko Becker
715b8707b5 GIT_SILENT Update Appstream for new release
(cherry picked from commit 172f4edeae)
2022-04-12 23:28:06 +02:00
Heiko Becker
172f4edeae GIT_SILENT Update Appstream for new release 2022-04-12 23:27:55 +02:00
Nicolas Fella
4202ccf000 [epub] Fix Windows build
epub_open wants const char*, not QByteArray
2022-04-11 18:35:05 +00:00
Albert Astals Cid
52d1a3b91e Fix "endl" use
If it was at the end of qDebug/qCritical/etc, just remove it, those
already have a newline at the end

The other few convert them to \n
2022-04-08 16:37:44 +02:00
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
2022-04-07 23:02:12 +00:00
M  B 
5339b7eef1 Markdown: Fix images with special chars in URLs not loaded
If an image URL contains a non-ASCII character (e.g. `kartöffelchen.jpg`), the html returned by the markdown parser contains the encoded path `kart%C3%B6ffelchen.jpg`. We must decode the path before checking if the image file exists.

(cherry picked from commit 8aa96484da)
2022-04-04 00:29:20 +02:00
M  B 
8aa96484da Markdown: Fix images with special chars in URLs not loaded
If an image URL contains a non-ASCII character (e.g. `kartöffelchen.jpg`), the html returned by the markdown parser contains the encoded path `kart%C3%B6ffelchen.jpg`. We must decode the path before checking if the image file exists.
2022-04-03 16:02:44 +00:00
Albert Astals Cid
5ceeb68dfe Remove unused KIO::Core dependencies 2022-04-03 10:57:09 +00:00
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
2022-03-31 17:08:01 +02:00
Albert Astals Cid
5944ce059f Android: improve a bit the "androiddeployqt is not smart and needs help" code
We do that by:
 * Remembering all the generators we're building
 * Linking the dependencies of all those generators against the app

For that to work we do three things:
 * Move the creation of the app target to after the generator targets
   have been created
 * Have a global variable that lists all the created generators
 * Move the find_package of the generator dependencies to the top level
   so it can be used from the mobile app target
2022-03-28 20:25:04 +00:00
Albert Astals Cid
d72d3a01a5 Merge remote-tracking branch 'origin/release/22.04' 2022-03-28 22:19:45 +02:00
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
2022-03-28 22:17:42 +02:00
Albert Astals Cid
0741ef1838 Port away from more QLinkedLists
QLinkedList is gone from Qt6

The almost 1:1 port is std::list but we don't need iterator stability on
removal/insertion so just port to QList
2022-03-22 12:58:59 +01:00
Albert Astals Cid
8941e43488 Port away from more QLinkedLists
QLinkedList is gone from Qt6

The 1:1 port is std::list but we don't need iterator stability on
removal/insertion so just port to QList (one case to std::vector since
QList needs a copy constructor)
2022-03-22 00:11:55 +01:00
Georgiy Sgibnev
17be599933 Dealing with a tmp file in case of a signing fail 2022-03-21 09:40:58 +03:00
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
2022-03-19 11:22:55 +00:00
Albert Astals Cid
6747e7fe8b signals-> Q_SIGNALS
A future ECM update is going to force that on us, so do it now anyway
2022-03-19 10:58:47 +00:00
Albert Astals Cid
a2e1043149 slots -> Q_SLOTS
A future ECM update is going to force that on us, so do it now anyway
2022-03-19 10:58:47 +00:00