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
KLDAP
Commits
9161898c
Commit
9161898c
authored
Jan 10, 2022
by
Laurent Montel
😁
Browse files
Fix build against qt6
parent
564f1981
Pipeline
#121593
passed with stage
in 1 minute and 47 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/widgets/addhostdialog.cpp
View file @
9161898c
...
...
@@ -66,7 +66,11 @@ AddHostDialog::AddHostDialog(KLDAP::LdapServer *server, QWidget *parent)
auto
buttonBox
=
new
QDialogButtonBox
(
QDialogButtonBox
::
Ok
|
QDialogButtonBox
::
Cancel
,
this
);
d
->
mOkButton
=
buttonBox
->
button
(
QDialogButtonBox
::
Ok
);
d
->
mOkButton
->
setDefault
(
true
);
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
d
->
mOkButton
->
setShortcut
(
Qt
::
CTRL
|
Qt
::
Key_Return
);
#else
d
->
mOkButton
->
setShortcut
({
Qt
::
CTRL
,
Qt
::
Key_Return
});
#endif
connect
(
buttonBox
,
&
QDialogButtonBox
::
rejected
,
this
,
&
AddHostDialog
::
reject
);
setModal
(
true
);
...
...
src/widgets/ldapclientsearch.cpp
View file @
9161898c
...
...
@@ -24,8 +24,7 @@
#include <KConfigGroup>
#include <KDirWatch>
#include <KProtocolInfo>
#include <kcoreaddons_version.h>
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include <Kdelibs4ConfigMigrator>
#endif
...
...
@@ -88,7 +87,7 @@ LdapClientSearch::~LdapClientSearch() = default;
void
LdapClientSearch
::
LdapClientSearchPrivate
::
init
(
const
QStringList
&
attributes
)
{
#if
KCOREADDONS
_VERSION < QT_VERSION_CHECK(6, 0, 0)
#if
QT
_VERSION < QT_VERSION_CHECK(6, 0, 0)
Kdelibs4ConfigMigrator
migrate
(
QStringLiteral
(
"ldapsettings"
));
migrate
.
setConfigFiles
(
QStringList
()
<<
QStringLiteral
(
"kabldaprc"
));
migrate
.
migrate
();
...
...
src/widgets/ldapclientsearchconfig.cpp
View file @
9161898c
...
...
@@ -9,7 +9,11 @@
#include <kldap/ldapserver.h>
#include <KConfig>
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include <qt5keychain/keychain.h>
#else
#include <qt6keychain/keychain.h>
#endif
using
namespace
QKeychain
;
using
namespace
KLDAP
;
...
...
src/widgets/ldapclientsearchconfigreadconfigjob.cpp
View file @
9161898c
...
...
@@ -10,7 +10,11 @@
#include <KConfig>
#include <KLocalizedString>
#include <kldap/ldapdn.h>
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include <qt5keychain/keychain.h>
#else
#include <qt6keychain/keychain.h>
#endif
using
namespace
QKeychain
;
using
namespace
KLDAP
;
...
...
src/widgets/ldapclientsearchconfigwriteconfigjob.cpp
View file @
9161898c
...
...
@@ -9,7 +9,11 @@
#include <KConfig>
#include <kldap/ldapdn.h>
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include <qt5keychain/keychain.h>
#else
#include <qt6keychain/keychain.h>
#endif
using
namespace
QKeychain
;
using
namespace
KLDAP
;
...
...
Write
Preview
Markdown
is supported
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