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 Workspace
Commits
d53aea4f
Commit
d53aea4f
authored
Mar 14, 2022
by
Laurent Montel
Browse files
Fix path against qt6/qt5
parent
b55d3285
Pipeline
#150148
passed with stage
in 11 minutes and 39 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
interactiveconsole/interactiveconsole.cpp
View file @
d53aea4f
...
...
@@ -120,8 +120,9 @@ InteractiveConsole::InteractiveConsole(ConsoleMode mode, QWidget *parent)
editorLayout
->
addWidget
(
toolBar
);
auto
tryLoadingKatePart
=
[
=
]()
->
KTextEditor
::
Document
*
{
const
auto
loadResult
=
KPluginFactory
::
instantiatePlugin
<
KTextEditor
::
Document
>
(
KPluginMetaData
(
QStringLiteral
(
"kf5/parts/katepart"
)),
this
);
const
auto
loadResult
=
KPluginFactory
::
instantiatePlugin
<
KTextEditor
::
Document
>
(
KPluginMetaData
(
QStringLiteral
(
"kf"
QT_STRINGIFY
(
QT_VERSION_MAJOR
)
"/parts/katepart"
)),
this
);
if
(
!
loadResult
)
{
qWarning
()
<<
"Error loading katepart plugin:"
<<
loadResult
.
errorString
;
return
nullptr
;
...
...
kcms/formats/localelistmodel.cpp
View file @
d53aea4f
...
...
@@ -57,7 +57,8 @@ QVariant LocaleListModel::data(const QModelIndex &index, int role) const
if
(
split
.
count
()
>
1
)
{
flagCode
=
split
[
1
].
toLower
();
}
auto
flagIconPath
=
QStandardPaths
::
locate
(
QStandardPaths
::
GenericDataLocation
,
QStringLiteral
(
"kf5/locale/countries/%1/flag.png"
).
arg
(
flagCode
));
auto
flagIconPath
=
QStandardPaths
::
locate
(
QStandardPaths
::
GenericDataLocation
,
QStringLiteral
(
"kf"
QT_STRINGIFY
(
QT_VERSION_MAJOR
)
"/locale/countries/%1/flag.png"
).
arg
(
flagCode
));
return
flagIconPath
;
}
case
DisplayName
:
{
...
...
kcms/kfontinst/apps/Viewer.cpp
View file @
d53aea4f
...
...
@@ -28,7 +28,9 @@ namespace KFI
{
CViewer
::
CViewer
()
{
const
auto
result
=
KPluginFactory
::
instantiatePlugin
<
KParts
::
ReadOnlyPart
>
(
KPluginMetaData
(
QStringLiteral
(
"kf5/parts/kfontviewpart"
)),
this
);
const
auto
result
=
KPluginFactory
::
instantiatePlugin
<
KParts
::
ReadOnlyPart
>
(
KPluginMetaData
(
QStringLiteral
(
"kf"
QT_STRINGIFY
(
QT_VERSION_MAJOR
)
"/parts/kfontviewpart"
)),
this
);
if
(
!
result
)
{
qCWarning
(
KFONTVIEW_DEBUG
)
<<
"Error loading kfontviewpart:"
<<
result
.
errorString
;
...
...
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