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
Utilities
Konsole
Commits
b5fba0d5
Commit
b5fba0d5
authored
Nov 20, 2021
by
Kurt Hindenburg
Browse files
Reset KF_MIN_VERSION back to 5.71.0
7e42fcc2
updated KF_MIN_VERSION; reset it back to a lower version with #ifdefs
parent
38fc4569
Pipeline
#99521
passed with stage
in 1 minute and 52 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
b5fba0d5
...
...
@@ -16,7 +16,7 @@ cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
# Match KDE Frameworks update Apr 2021
set
(
QT_MIN_VERSION
"5.15.0"
)
set
(
KF5_MIN_VERSION
"5.
86
.0"
)
set
(
KF5_MIN_VERSION
"5.
71
.0"
)
# Release script will create bugzilla versions
project
(
konsole VERSION
${
RELEASE_SERVICE_VERSION
}
)
...
...
src/tests/PartManualTest.cpp
View file @
b5fba0d5
...
...
@@ -21,6 +21,12 @@
#include
<KMainWindow>
#include
<KPluginFactory>
#include
<qtest.h>
#include
<kservice_version.h>
#if KSERVICE_VERSION < QT_VERSION_CHECK(5, 86, 0)
#include
<KPluginLoader>
#include
<KService>
#endif
// Konsole
#include
"../Pty.h"
...
...
@@ -103,11 +109,21 @@ void PartManualTest::shortcutTriggered()
KParts
::
Part
*
PartManualTest
::
createPart
()
{
const
KPluginFactory
::
Result
<
KParts
::
Part
>
result
=
KPluginFactory
::
instantiatePlugin
<
KParts
::
Part
>
(
KPluginMetaData
(
QStringLiteral
(
"konsolepart"
)),
this
);
#if KSERVICE_VERSION < QT_VERSION_CHECK(5, 86, 0)
KService
::
Ptr
service
=
KService
::
serviceByDesktopName
(
QStringLiteral
(
"konsolepart"
));
Q_ASSERT
(
service
);
KPluginFactory
*
factory
=
KPluginLoader
(
service
->
library
()).
factory
();
Q_ASSERT
(
factory
);
auto
*
terminalPart
=
factory
->
create
<
KParts
::
Part
>
(
this
);
return
terminalPart
;
#else
const
KPluginFactory
::
Result
<
KParts
::
Part
>
result
=
KPluginFactory
::
instantiatePlugin
<
KParts
::
Part
>
(
KPluginMetaData
(
QStringLiteral
(
"konsolepart"
)),
this
);
Q_ASSERT
(
result
);
return
result
.
plugin
;
#endif
}
QTEST_MAIN
(
PartManualTest
)
src/tests/demo_konsolepart/src/demo_konsolepart.cpp
View file @
b5fba0d5
...
...
@@ -16,6 +16,12 @@
#include
<KWindowSystem>
#include
<kwindowsystem_version.h>
#include
<kservice_version.h>
#if KSERVICE_VERSION < QT_VERSION_CHECK(5, 86, 0)
#include
<KPluginLoader>
#include
<KService>
#endif
// see below notes
//#include "../../../WindowSystemInfo.h"
...
...
@@ -73,12 +79,22 @@ demo_konsolepart::~demo_konsolepart()
KParts
::
ReadOnlyPart
*
demo_konsolepart
::
createPart
()
{
#if KSERVICE_VERSION < QT_VERSION_CHECK(5, 86, 0)
KService
::
Ptr
service
=
KService
::
serviceByDesktopName
(
QStringLiteral
(
"konsolepart"
));
Q_ASSERT
(
service
);
KPluginFactory
*
factory
=
KPluginLoader
(
service
->
library
()).
factory
();
Q_ASSERT
(
factory
);
auto
*
terminalPart
=
factory
->
create
<
KParts
::
ReadOnlyPart
>
(
this
);
return
terminalPart
;
#else
const
KPluginFactory
::
Result
<
KParts
::
ReadOnlyPart
>
result
=
KPluginFactory
::
instantiatePlugin
<
KParts
::
ReadOnlyPart
>
(
KPluginMetaData
(
QStringLiteral
(
"konsolepart"
)),
this
);
Q_ASSERT
(
result
);
return
result
.
plugin
;
#endif
}
void
demo_konsolepart
::
manageProfiles
()
...
...
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