l10n daemon script
2dc008898c
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
Laurent Montel
2228bd502e
Show more headers in qtc6
4 years ago
l10n daemon script
b71a5085cc
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
2e5340ff14
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
f472bd71d3
GIT_SILENT made messages (after extraction)
4 years ago
l10n daemon script
43114cafd8
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
2ef46be24f
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 57d6bd4f2f )
4 years ago
Laurent Montel
5ce71aa6e1
Add missing override
4 years ago
Laurent Montel
424340e392
Use Q_EMIT/nullptr/fix gcc warning
4 years ago
Laurent Montel
54e8e80cc3
Const'ref
4 years ago
Laurent Montel
271c5f8a6b
Port deprecated enum
4 years ago
Laurent Montel
13092decbb
Show more headers in qtc6
4 years ago
Laurent Montel
42db837288
Remove duplicate headers between cpp/h
4 years ago
Laurent Montel
584edda88e
const'ify method + use nullptr
4 years ago
Antonio Rojas
f6b26af2c7
Show the actual QtWebEngine version in about dialog
...
It was claiming to show the QtWebEngine version but really showing the QtCore one.
Those two are different nowadays in most distros, since Qt 5.15 releases are commercial only for a year (except for WebEngine)
4 years ago
Laurent Montel
3fa1e81105
Modernize code
4 years ago
Laurent Montel
4543c74436
Use QStringLiteral + use nullptr
4 years ago
Laurent Montel
ba459ba600
Use nullptr here too
4 years ago
Laurent Montel
d6c4035ff6
We depend against qt5.15
4 years ago
Laurent Montel
c6ad2708d4
use nullptr here
4 years ago
Laurent Montel
05b3f2eeec
Show all headers in qtc6
4 years ago
Laurent Montel
1906529b68
Show headers in qtc6 + we can use qt cmake macro as we depend against
...
qt5.15
4 years ago
l10n daemon script
a8a9a5d7e5
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
684d4cd1d2
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
a976f194e3
GIT_SILENT made messages (after extraction)
4 years ago
l10n daemon script
de0229a3de
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
39ed7cc61f
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 90e579d882 )
4 years ago
l10n daemon script
988f12ece9
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
ae8955b12d
GIT_SILENT made messages (after extraction)
4 years ago
l10n daemon script
fd60ff3e4b
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
Laurent Montel
18971d364e
Use ref here
4 years ago
Heiko Becker
e8369584bb
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit f2147a2bb3 )
4 years ago
l10n daemon script
f40b707e58
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
437ba0be77
GIT_SILENT made messages (after extraction)
4 years ago
l10n daemon script
eaeff714d6
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
2becc00be8
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
be9f4a933f
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
b460ab0ae7
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 7220a0a544 )
4 years ago
Juraj Oravec
9085681bb3
QML: Fix enum documentation doxygen comments
4 years ago
Juraj Oravec
1b0e728e02
QML: Fix documentation links for window/s
...
Signed-off-by: Juraj Oravec <jurajoravec@mailo.com>
4 years ago
l10n daemon script
c750820f7c
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
Juraj Oravec
3038d1acd5
Add Doxygen overview of QML API
...
Signed-off-by: Juraj Oravec <jurajoravec@mailo.com>
4 years ago
Juraj Oravec
5a5f983644
SiteInfo: Don't load previews at multiselect
...
BUG: 451284
It looks like the signal currentItemChanged is fired before the
selectedItems is updated which makes this protection after the second
change of current selection.
This is at minimum good enough when selecting items via arrow keys.
Signed-off-by: Juraj Oravec <jurajoravec@mailo.com>
4 years ago
Juraj Oravec
d0ee2f0f37
SiteInfo: Improve ability to copy data from lists
...
BUG: 451284
Signed-off-by: Juraj Oravec <jurajoravec@mailo.com>
4 years ago
l10n daemon script
4a549b035f
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
478861094a
GIT_SILENT made messages (after extraction)
4 years ago
l10n daemon script
8edcd52593
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
Antonio Rojas
02feca74ce
Enable WebRTC screen capturer in WebEngine
...
This is disabled by default, and without it screen sharing doesn't work on Wayland
Port of https://invent.kde.org/network/konqueror/-/merge_requests/113
BUG: 450839
4 years ago
l10n daemon script
e9e1d32339
GIT_SILENT made messages (after extraction)
4 years ago
Albert Astals Cid
7fc9473052
Merge remote-tracking branch 'origin/release/22.04'
4 years ago