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
PIM
Kleopatra
Commits
183c899a
Commit
183c899a
authored
Jan 13, 2022
by
Laurent Montel
Browse files
Use directly QT_VERSION
parent
0e94d0e0
Pipeline
#122500
passed with stage
in 2 minutes and 30 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/kwatchgnupg/main.cpp
View file @
183c899a
...
...
@@ -11,8 +11,7 @@
#include
"aboutdata.h"
#include
"kwatchgnupgmainwin.h"
#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
#include
"utils/kuniqueservice.h"
...
...
@@ -31,7 +30,7 @@ int main(int argc, char **argv)
#endif
QApplication
app
(
argc
,
argv
);
KCrash
::
initialize
();
#if
KCOREADDONS
_VERSION < QT_VERSION_CHECK(6, 0, 0)
#if
QT
_VERSION < QT_VERSION_CHECK(6, 0, 0)
Kdelibs4ConfigMigrator
migrate
(
QStringLiteral
(
"kwatchgnupg"
));
migrate
.
setConfigFiles
(
QStringList
()
<<
QStringLiteral
(
"kwatchgnupgrc"
));
migrate
.
setUiFiles
(
QStringList
()
<<
QStringLiteral
(
"kwatchgnupgui.rc"
));
...
...
src/main.cpp
View file @
183c899a
...
...
@@ -18,8 +18,7 @@
#include
"accessibility/accessiblewidgetfactory.h"
#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
...
...
@@ -159,7 +158,7 @@ int main(int argc, char **argv)
parser
.
process
(
QApplication
::
arguments
());
aboutData
.
processCommandLine
(
&
parser
);
#if
KCOREADDONS
_VERSION < QT_VERSION_CHECK(6, 0, 0)
#if
QT
_VERSION < QT_VERSION_CHECK(6, 0, 0)
Kdelibs4ConfigMigrator
migrate
(
QStringLiteral
(
"kleopatra"
));
migrate
.
setConfigFiles
(
QStringList
()
<<
QStringLiteral
(
"kleopatrarc"
)
<<
QStringLiteral
(
"libkleopatrarc"
));
...
...
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