Albert Astals Cid
c38af3e695
Add a few more formats supported by qimageformat plugins
...
BUGS: 434888
BUGS: 434889
5 years ago
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
5 years ago
Heiko Becker
5044a63cd4
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 5951fc2731 )
5 years ago
Heiko Becker
5951fc2731
GIT_SILENT Update Appstream for new release
5 years ago
Heiko Becker
1c97e60dbd
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 2aff8958b1 )
5 years ago
Heiko Becker
2aff8958b1
GIT_SILENT Update Appstream for new release
5 years ago
l10n daemon script
ee40297976
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
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"
5 years ago
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"
5 years ago
Laurent Montel
dd1938755e
Don't include QtTest as it includes all QtCore includes
5 years ago
l10n daemon script
a61977aa8a
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
33483a10fa
GIT_SILENT made messages (after extraction)
5 years ago
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"
5 years ago
l10n daemon script
a752711872
GIT_SILENT made messages (after extraction)
5 years ago
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
5 years ago
Christoph Feck
02c3bd691a
GIT_SILENT Update Appstream for new release
5 years ago
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"
5 years ago
l10n daemon script
6abe9fcdfd
GIT_SILENT made messages (after extraction)
5 years ago
Christoph Feck
6a31bfc7e3
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 0abdab924d )
6 years ago
Christoph Feck
0abdab924d
GIT_SILENT Update Appstream for new release
6 years ago
Christoph Feck
b3101774cf
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 4b9e50a1ed )
6 years ago
Christoph Feck
4b9e50a1ed
GIT_SILENT Update Appstream for new release
6 years ago
Christoph Feck
f6ce4a57d8
GIT_SILENT Update Appstream for new release
6 years ago
Christoph Feck
d0b9d83946
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit f6ce4a57d8 )
6 years ago
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"
6 years ago
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)
6 years ago
Laurent Montel
516fb89d94
Use camelcase include. (scripted)
6 years ago
Christoph Feck
182e2791d7
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 13dc58655a )
6 years ago
l10n daemon script
7254c56886
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"
6 years ago
l10n daemon script
e5f4a0d6da
GIT_SILENT made messages (after extraction)
6 years ago
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"
6 years ago
l10n daemon script
f046034c69
GIT_SILENT made messages (after extraction)
6 years ago
l10n daemon script
1f50b2a6b4
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"
6 years ago
l10n daemon script
c8fee988f4
GIT_SILENT made messages (after extraction)
6 years ago
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"
6 years ago
l10n daemon script
6cd2e32e64
GIT_SILENT made messages (after extraction)
6 years ago
l10n daemon script
35e43602d4
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"
6 years ago
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"
6 years ago
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"
6 years ago
Christoph Feck
6bb75da566
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 884b082aea )
6 years ago
Christoph Feck
884b082aea
GIT_SILENT Update Appstream for new release
6 years ago
Christoph Feck
3d148bd570
GIT_SILENT Update Appstream for new release
6 years ago
Christoph Feck
5e1f2c9a47
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 3d148bd570 )
6 years ago
Albert Astals Cid
903cdec02b
GIT_SILENT fix version
...
need to figure out a way to make this work :/
6 years ago
Christoph Feck
8fd53e5674
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit c8dcf1fdea )
6 years ago
Christoph Feck
c8dcf1fdea
GIT_SILENT Update Appstream for new release
6 years ago
Nicolas Fella
7d24a51e6a
Launch okularkirigami directly instead of via kpackagelauncherqml
6 years ago
Christoph Feck
a7876ca013
GIT_SILENT Update Appstream for new release
6 years ago
Albert Astals Cid
82d5810493
CI: Enable clazy detaching-temporary
6 years ago
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"
6 years ago