Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
KNotes
Commits
0c9bdcca
Commit
0c9bdcca
authored
Aug 07, 2021
by
Laurent Montel
😁
Browse files
We depend against 5.84
parent
1fb0c138
Pipeline
#73774
failed with stage
in 3 minutes and 10 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
noteshared/src/network/notehostdialog.cpp
View file @
0c9bdcca
...
...
@@ -11,13 +11,8 @@
#include
"notesharedglobalconfig.h"
#include
<kdnssd_version.h>
#if KDNSSD_VERSION >= QT_VERSION_CHECK(5, 84, 0)
#include
<KDNSSD/ServiceBrowser>
#include
<KDNSSD/ServiceModel>
#else
#include
<DNSSD/ServiceBrowser>
#include
<DNSSD/ServiceModel>
#endif
#include
<KHistoryComboBox>
#include
<KLocalizedString>
...
...
src/apps/knotesapp.cpp
View file @
0c9bdcca
...
...
@@ -43,11 +43,7 @@
#include
<KActionCollection>
#include
<kdnssd_version.h>
#if KDNSSD_VERSION >= QT_VERSION_CHECK(5, 84, 0)
#include
<KDNSSD/PublicService>
#else
#include
<DNSSD/PublicService>
#endif
#include
<KGlobalAccel>
#include
<KIconEffect>
#include
<KLocalizedString>
...
...
src/configdialog/knoteconfigdialog.cpp
View file @
0c9bdcca
...
...
@@ -40,11 +40,7 @@ KNoteConfigDialog::KNoteConfigDialog(const QString &title, QWidget *parent)
setWindowTitle
(
title
);
const
QVector
<
KPluginMetaData
>
availablePlugins
=
KPluginLoader
::
findPlugins
(
QStringLiteral
(
"pim/kcms/knotes"
));
for
(
const
KPluginMetaData
&
metaData
:
availablePlugins
)
{
#if KCMUTILS_VERSION >= QT_VERSION_CHECK(5, 84, 0)
addModule
(
metaData
);
#else
addModule
(
metaData
.
pluginId
());
#endif
}
connect
(
button
(
QDialogButtonBox
::
Ok
),
&
QPushButton
::
clicked
,
this
,
&
KNoteConfigDialog
::
slotOk
);
...
...
src/kontactplugin/knotes_part.cpp
View file @
0c9bdcca
...
...
@@ -50,11 +50,7 @@
#include
<KActionCollection>
#include
<KCheckableProxyModel>
#include
<kdnssd_version.h>
#if KDNSSD_VERSION >= QT_VERSION_CHECK(5, 84, 0)
#include
<KDNSSD/PublicService>
#else
#include
<DNSSD/PublicService>
#endif
#include
<KLocalizedString>
#include
<KMessageBox>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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