Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Plasma
Plasma Desktop
Commits
634734e2
Commit
634734e2
authored
Mar 29, 2022
by
Volker Krause
Browse files
Remove 4 era migration code and legacy plugin loading for Qt6
parent
b2773580
Pipeline
#159173
passed with stage
in 5 minutes and 22 seconds
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
kcms/kded/modulesmodel.cpp
View file @
634734e2
...
...
@@ -152,6 +152,7 @@ static QVector<KPluginMetaData> availableModules()
for
(
const
KPluginMetaData
&
md
:
qAsConst
(
plugins
))
{
moduleIds
.
insert
(
md
.
pluginId
());
}
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
// also search for old .desktop based kded modules
const
KPluginInfo
::
List
oldStylePlugins
=
KPluginInfo
::
fromServices
(
KServiceTypeTrader
::
self
()
->
query
(
QStringLiteral
(
"KDEDModule"
)));
for
(
const
KPluginInfo
&
info
:
oldStylePlugins
)
{
...
...
@@ -166,6 +167,7 @@ static QVector<KPluginMetaData> availableModules()
plugins
.
append
(
info
.
toMetaData
());
}
}
#endif
return
plugins
;
}
...
...
kcms/mouse/backends/x11/evdev_settings.cpp
View file @
634734e2
...
...
@@ -11,7 +11,9 @@
#include
<QDBusConnection>
#include
<QDBusMessage>
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include
"../migrationlib/kdelibs4config.h"
#endif
void
EvdevSettings
::
apply
(
X11EvdevBackend
*
backend
,
bool
force
)
{
...
...
@@ -130,8 +132,10 @@ void EvdevSettings::save()
group
.
sync
();
kcminputProfile
->
sync
();
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
Kdelibs4SharedConfig
::
syncConfigGroup
(
QLatin1String
(
"Mouse"
),
"kcminputrc"
);
Kdelibs4SharedConfig
::
syncConfigGroup
(
QLatin1String
(
"KDE"
),
"kdeglobals"
);
#endif
emitChange
(
SettingsChanged
,
SETTINGS_MOUSE
);
}
kcms/mouse/kcm/xlib/xlib_config.cpp
View file @
634734e2
...
...
@@ -16,8 +16,6 @@
#include
"../configcontainer.h"
#include
"backends/x11/x11_evdev_backend.h"
#include
"../../../migrationlib/kdelibs4config.h"
#include
<KLocalizedString>
#include
<KToolInvocation>
//#include <KConfig>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment