Ömer Fadıl Usta
107e5c235a
Portaway from ERR_SLAVE_DEFINED
4 years ago
l10n daemon script
8e7c9dbe5c
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
189ff0c175
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
560b4ca52b
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
7bb5f17a92
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
f243c71f2b
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
Fushan Wen
47d18f8d3e
kcms/kfontinst: use `static_cast`
...
C-style pointer casting (CWE-398)
4 years ago
l10n daemon script
79b5eb22a6
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
bd7f3bcc1b
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
f363b0fe42
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
a09776c06c
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
Volker Krause
241c6976c3
Use non-deprecated KAuth includes
...
Needed to build with KF deprecation level 5.92 or above.
4 years ago
Volker Krause
d0652a37a4
Remove the last uses of QDesktopWidget
4 years ago
l10n daemon script
100aa732fa
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
Volker Krause
42e5eea0b8
Remove the last use of QTextStream::codec(), which is gone in Qt6
...
We never set a codec on the stream we get here, so it's always the default,
the codec for the current locale.
4 years ago
l10n daemon script
460a6485b9
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
Volker Krause
d5d06e484e
Properly include KF includes
...
With https://invent.kde.org/frameworks/kwayland/-/merge_requests/52 we
can build without the 4 era legacy include paths for the first time, which
uncovered those.
4 years ago
Volker Krause
c2576f8a1f
Adapt to Qt6's removal of Qt::X11Extras
4 years ago
Volker Krause
bf529ccd47
Port fonts KCM to KLazyLocalizedString
...
I18N_NOOP is deprecated and gone in KF6.
4 years ago
Laurent Montel
d53aea4f66
Fix path against qt6/qt5
4 years ago
l10n daemon script
1f3a932c5e
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
c2c3a2d6b7
Install in kf<version>
4 years ago
Volker Krause
a8006e8b0b
Adapt build system to also support building against Qt6
4 years ago
Volker Krause
9d7ed1d3d5
Port from QRegExp to QRegularExpression
4 years ago
Volker Krause
0bf22263b1
Port from KNS3::Button to KNSWidgets::Button
...
The former isn't available in KF6 anymore.
4 years ago
Volker Krause
38c723e596
Use version-less Qt targets, variables and macros
...
Prepares for building against Qt6.
4 years ago
l10n daemon script
a298977479
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
a7588366e6
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
4d532f0801
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
Ahmad Samir
f8c6099a32
Don't install two copies of kcm_fontinst
...
This looks like an oversight after switching to use the
kcoreaddons_add_plugin macro.
4 years ago
Ahmad Samir
24d4b12469
Use Qt logging categories
...
So as not to unnecessarily fill the system log (or binary journal, because
plain text log files are not the fashion any more).
GIT_SILENT
4 years ago
Ben Cooksley
8c11f207e2
Use the correct endpoint for this - hosted by a CDN and therefore capable of handling much greater volumes of traffic.
...
CCMAIL: plasma-devel@kde.org
CCMAIL: distributions@kde.org
4 years ago
l10n daemon script
daed0461eb
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
2141988c3b
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
6721c2ec92
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
1c12775ec7
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
David Edmundson
6f5a28665c
[kcms/kfontinst] Re-enable on wayland
...
The entire KCM was diabled due to crashes:
Since c305dcd85d the relevant
section is disabled instead of crashing. This allows us to reintroduce
the KCM, albeit with previews currently disabled.
BUG: 439375
FIXED-IN: 5.24
4 years ago
l10n daemon script
0d0b713076
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
5259ac39ab
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
594b933a1e
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
5a792e989f
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
Oleg Solovyov
a91ac4268c
Use KNewStuff widgets
...
We don't need to show GHNS buttons/actions when such actions are
restricted by admin
4 years ago
Alexander Lohnau
79c7c9cc12
Remove unneeded X-KDE-ParentApp definitions in json metadata
4 years ago
Alexander Lohnau
ff19a1c343
Remove unneeded ServiceType definitions in json metadata
...
We already do the filtering based on the plugin namespace and no
longer through the SevriceTyoes.
4 years ago
Alexander Lohnau
324516d8d4
Remove categories from KCM desktop files
...
KCMs do not show up in the categorized views of the launcher
and never did. Consequently the categories can be removed.
4 years ago
Alexander Lohnau
1f088b398f
Remove Comment entries from KCM desktop files
...
We do not display the comment for desktop files
in the panel, task manager or desktop.
Because we no longer depend on desktop-to-json conversion, we
can remove the entries.
4 years ago
l10n daemon script
7ebe49f96f
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
41e9c0e65f
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
b64be79def
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
Ahmad Samir
6edabcf3f0
Fix installation location of kfontviewpart.rc
...
It looks like commit 8b297dbbb0 (spotted by Albert Astals Cid), broke
this, the KAboutData object used KFI_NAME (which is "kfontinst"), which made
KxmlGui pick kfontviewpart.rc from ${KDE_INSTALL_KXMLGUI5DIR}/kfontinst.
Change the location to ${KDE_INSTALL_KXMLGUI5DIR}/kfontview, which is where
kfontviewui.rc is installed already.
4 years ago