Commit graph

459 commits

Author SHA1 Message Date
Alexander Lohnau 8b13d989c6
Clean up ServiceType property usage for JSON based plugins
This is no needed anymore, because the plugins are installed into a
specific dir. It is a leftover from the time where the ServiceTypes were
used to find the correct plugins.

Task: https://phabricator.kde.org/T14483
2021-05-21 06:53:52 +02:00
Heiko Becker 5941247354 GIT_SILENT Update Appstream for new release
(cherry picked from commit 1898bd2bec)
2021-05-07 20:22:29 +02:00
l10n daemon script 74c92306b8 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"
2021-04-21 01:16:32 +00:00
Heiko Becker e6dae5d4f9 GIT_SILENT Update Appstream for new release
(cherry picked from commit 8bdc851688)
2021-04-14 17:11:17 +02:00
Albert Astals Cid c38af3e695 Add a few more formats supported by qimageformat plugins
BUGS: 434888
BUGS: 434889
2021-03-24 23:42:05 +01:00
Albert Astals Cid 3f923aa7b5 Move to new appstream format for mimetypes
It seems using mimetypes+mimetype is bad and now you have to use
provides+mediatype
2021-03-10 00:24:14 +00:00
Heiko Becker 5044a63cd4 GIT_SILENT Update Appstream for new release
(cherry picked from commit 5951fc2731)
2021-02-25 00:25:13 +01:00
Heiko Becker 1c97e60dbd GIT_SILENT Update Appstream for new release
(cherry picked from commit 2aff8958b1)
2021-01-29 21:09:47 +01:00
l10n daemon script 4161fec216 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"
2020-12-31 06:17:32 +01:00
l10n daemon script f16b767057 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"
2020-12-20 06:07:29 +01:00
Laurent Montel dd1938755e Don't include QtTest as it includes all QtCore includes 2020-12-13 17:51:28 +01:00
l10n daemon script c9440a9160 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"
2020-11-25 06:34:22 +01:00
l10n daemon script a752711872 GIT_SILENT made messages (after extraction) 2020-11-25 02:20:39 +01:00
David Hurka 19d5dd8ec7 New part/ directory for okularpart sources from /, ui/, conf/
Source files are no longer separated by UI and non-UI and similar,
but only by their build target.

* ui/ -> part/
* Move all source files from conf/ to part/
* Keep config skeleton definitions in conf/, needed for the mobile target too
* Move editdrawingtooldialogtest.h from conf/autotests/ to autotests/
* ui/data/icons/ -> icons/
* Move /part.cpp, /part.rc and similar files to part/
* Adapt include paths in source files
* Adapt CMakeLists.txt files (in / and in subdirectories)
* Adapt /Messages.sh
2020-11-18 19:32:56 +00:00
David Hurka 055d5709c1 Merge branch 'release/20.08' into master 2020-11-08 02:05:10 +01:00
Christoph Feck 02c3bd691a GIT_SILENT Update Appstream for new release 2020-10-31 18:08:36 +01:00
l10n daemon script dc74ffa68c 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"
2020-10-17 06:04:22 +02:00
l10n daemon script 6abe9fcdfd GIT_SILENT made messages (after extraction) 2020-10-17 02:16:46 +02:00
Christoph Feck 6a31bfc7e3 GIT_SILENT Update Appstream for new release
(cherry picked from commit 0abdab924d)
2020-10-03 14:20:24 +02:00
Christoph Feck 0abdab924d GIT_SILENT Update Appstream for new release 2020-10-03 14:20:23 +02:00
Christoph Feck b3101774cf GIT_SILENT Update Appstream for new release
(cherry picked from commit 4b9e50a1ed)
2020-08-31 21:02:07 +02:00
Christoph Feck 4b9e50a1ed GIT_SILENT Update Appstream for new release 2020-08-31 21:02:06 +02:00
Christoph Feck f6ce4a57d8 GIT_SILENT Update Appstream for new release 2020-08-05 09:52:57 +02:00
Christoph Feck d0b9d83946 GIT_SILENT Update Appstream for new release
(cherry picked from commit f6ce4a57d8)
2020-08-05 09:52:57 +02:00
l10n daemon script 3ef3de28c8 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"
2020-07-25 05:29:31 +02:00
Albert Astals Cid 19d98d6a74 Run clang-format
find . \( -name "*.cpp" -or -name "*.h"  -or -name "*.c"  -or -name "*.cc" \) -exec clang-format -i {} \;

If you reached this file doing a git blame, please see README.clang-format (added 2 commits in the future of this one)
2020-07-11 09:17:33 +02:00
Laurent Montel 516fb89d94 Use camelcase include. (scripted) 2020-07-08 13:54:37 +02:00
Christoph Feck 182e2791d7 GIT_SILENT Update Appstream for new release
(cherry picked from commit 13dc58655a)
2020-07-03 23:03:22 +02:00
l10n daemon script 90502b2961 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"
2020-06-18 05:35:59 +02:00
l10n daemon script f046034c69 GIT_SILENT made messages (after extraction) 2020-06-18 02:14:44 +02:00
l10n daemon script 2857dc241f 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"
2020-06-17 14:03:40 +02:00
l10n daemon script 6cd2e32e64 GIT_SILENT made messages (after extraction) 2020-06-17 11:28:48 +02:00
l10n daemon script ef53790eba 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"
2020-06-10 05:21:36 +02:00
Nate Graham 4ee6b5066d Merge branch 'release/20.04' 2020-06-09 13:16:33 -06:00
l10n daemon script cc452498e5 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"
2020-06-09 09:16:32 +02:00
Christoph Feck 6bb75da566 GIT_SILENT Update Appstream for new release
(cherry picked from commit 884b082aea)
2020-06-08 19:53:17 +02:00
Christoph Feck 884b082aea GIT_SILENT Update Appstream for new release 2020-06-08 19:53:16 +02:00
Christoph Feck 3d148bd570 GIT_SILENT Update Appstream for new release 2020-05-11 23:14:44 +02:00
Christoph Feck 5e1f2c9a47 GIT_SILENT Update Appstream for new release
(cherry picked from commit 3d148bd570)
2020-05-11 23:14:44 +02:00
Albert Astals Cid d8e4796830 Merge remote-tracking branch 'origin/release/20.04' 2020-04-16 00:06:40 +02:00
Albert Astals Cid 903cdec02b GIT_SILENT fix version
need to figure out a way to make this work :/
2020-04-16 00:06:00 +02:00
Christoph Feck 8fd53e5674 GIT_SILENT Update Appstream for new release
(cherry picked from commit c8dcf1fdea)
2020-04-15 11:06:58 +02:00
Christoph Feck c8dcf1fdea GIT_SILENT Update Appstream for new release 2020-04-15 11:06:58 +02:00
Nicolas Fella 7d24a51e6a Launch okularkirigami directly instead of via kpackagelauncherqml 2020-03-29 12:39:19 +00:00
Albert Astals Cid 4964e7e42d Merge remote-tracking branch 'origin/release/19.12' 2020-03-02 22:22:06 +01:00
Christoph Feck a7876ca013 GIT_SILENT Update Appstream for new release 2020-03-01 10:37:27 +01:00
Albert Astals Cid af35ef4fbf Merge remote-tracking branch 'origin/release/19.12' 2020-02-23 22:33:56 +01:00
Albert Astals Cid 82d5810493 CI: Enable clazy detaching-temporary 2020-02-19 23:44:41 +01:00
l10n daemon script a26dd5118a 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"
2020-02-04 10:04:28 +01:00
l10n daemon script 0d5bd0bc43 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"
2020-02-04 06:09:17 +01:00