Christoph Feck
13dc58655a
GIT_SILENT Update Appstream for new release
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
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
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
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
884b082aea
GIT_SILENT Update Appstream for new release
6 years ago
Christoph Feck
3d148bd570
GIT_SILENT Update Appstream for new release
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
c8dcf1fdea
GIT_SILENT Update Appstream for new release
6 years ago
Christoph Feck
a7876ca013
GIT_SILENT Update Appstream for new release
6 years ago
Albert Astals Cid
93540ac16d
Enable most of clazy level2
6 years ago
Albert Astals Cid
beb195c9e6
Enable clazy qcolor-from-literal
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
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"
6 years ago
Christoph Feck
a18c013932
GIT_SILENT Update Appstream for new release
6 years ago
l10n daemon script
79de5d3958
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
a5eda6348f
GIT_SILENT made messages (after extraction)
6 years ago
Christoph Feck
475652a990
Update Appstream for new release
6 years ago
Albert Astals Cid
c81392a71c
Remove wrong forward declarations
...
They are not needed and clang-tidy says they are on the wrong namespace
anyway
6 years ago
Albert Astals Cid
78cf6bd910
CI: enable more modernize checks
...
Since unfortunately some of the autogenerated includes don't pass the
checks we do a trick of building out of source and then specifying the
.*/okular/.* path as the only includes we care about
6 years ago
Albert Astals Cid
f7f2b3105f
Increase version here too
6 years ago
Christoph Feck
7974aa1d36
Update Appstream for new release
6 years ago
Yuri Chornoivan
b510bb8f20
Update links to the dependencies
6 years ago
l10n daemon script
b16dcf41aa
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"
7 years ago
l10n daemon script
bf7a53d62b
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"
7 years ago
l10n daemon script
aaa176041d
GIT_SILENT made messages (after extraction)
7 years ago
l10n daemon script
5e01eff352
GIT_SILENT made messages (after extraction)
7 years ago
l10n daemon script
241bc6525a
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"
7 years ago
Shubham Jangra
b03bfa1163
Fix unused parameter warnings
7 years ago
Albert Astals Cid
47d7d04b5e
delete copy constructor and assignment operator of some internal classes
...
they are unused(except the PageViewItem one), but if anyone would use
them things would go wrong, so protect us from it
Actually fixes a bug in PageView::slotFitWindowToPage in which we were
copying constructing PageViewItem and that's bad
7 years ago
l10n daemon script
33a5f67eb2
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"
8 years ago
l10n daemon script
4e9bbfddb0
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"
8 years ago
l10n daemon script
96f4f27ba6
GIT_SILENT made messages (after extraction)
8 years ago
Yuri Chornoivan
39b6e8147d
Fix minor EBN issues
8 years ago
Yuri Chornoivan
c04ca1fa96
Fix minor EBN issues
8 years ago
l10n daemon script
d85fe1df64
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"
8 years ago
l10n daemon script
bae0e13719
GIT_SILENT made messages (after extraction)
8 years ago
l10n daemon script
f1d3c68115
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"
8 years ago
l10n daemon script
5f93a0b90e
GIT_SILENT made messages (after extraction)
8 years ago
l10n daemon script
c4570f7e40
GIT_SILENT made messages (after extraction)
8 years ago
l10n daemon script
2e73a6d76f
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"
8 years ago
l10n daemon script
879a46ac55
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"
8 years ago
l10n daemon script
b7c733f459
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"
8 years ago
l10n daemon script
ee57925c57
GIT_SILENT made messages (after extraction)
8 years ago
l10n daemon script
26c40ab7bd
GIT_SILENT made messages (after extraction)
8 years ago
Aleix Pol
c325b342f3
Make some frameworks optional so okular can be built on Android
...
Summary:
Disables KWallet integration if there's no KWallet, KJS if there's no
KJS and KDocTools.
Here's a list of frameworks that don't work on Android:
https://cgit.kde.org/sysadmin/ci-tooling.git/tree/local-metadata/project-ignore-rules.yaml
Test Plan: Still works locally, ran Okular and Okular Mobile on Android.
Reviewers: #okular, aacid
Subscribers: aacid
Tags: #okular
Differential Revision: https://phabricator.kde.org/D12177
8 years ago
l10n daemon script
13e719b300
GIT_SILENT made messages (after extraction)
8 years ago
l10n daemon script
b9bc49fb84
GIT_SILENT made messages (after extraction)
8 years ago