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
Kleopatra
Commits
b05526bb
Commit
b05526bb
authored
Apr 22, 2021
by
Laurent Montel
😁
Browse files
In kf6 kde4 migration code will be removed
parent
88ce1d28
Pipeline
#59129
passed with stage
in 14 minutes and 3 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/kwatchgnupg/main.cpp
View file @
b05526bb
...
...
@@ -11,7 +11,10 @@
#include "aboutdata.h"
#include "kwatchgnupgmainwin.h"
#include <kcoreaddons_version.h>
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include <Kdelibs4ConfigMigrator>
#endif
#include "utils/kuniqueservice.h"
#include <KLocalizedString>
...
...
@@ -26,10 +29,12 @@ int main(int argc, char **argv)
QCoreApplication
::
setAttribute
(
Qt
::
AA_EnableHighDpiScaling
,
true
);
QApplication
app
(
argc
,
argv
);
KCrash
::
initialize
();
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
Kdelibs4ConfigMigrator
migrate
(
QStringLiteral
(
"kwatchgnupg"
));
migrate
.
setConfigFiles
(
QStringList
()
<<
QStringLiteral
(
"kwatchgnupgrc"
));
migrate
.
setUiFiles
(
QStringList
()
<<
QStringLiteral
(
"kwatchgnupgui.rc"
));
migrate
.
migrate
();
#endif
KLocalizedString
::
setApplicationDomain
(
"kwatchgnupg"
);
AboutData
aboutData
;
...
...
src/main.cpp
View file @
b05526bb
...
...
@@ -16,7 +16,10 @@
#include "kleopatraapplication.h"
#include "mainwindow.h"
#include <kcoreaddons_version.h>
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include <Kdelibs4ConfigMigrator>
#endif
#include <commands/reloadkeyscommand.h>
#include <commands/selftestcommand.h>
...
...
@@ -151,13 +154,13 @@ int main(int argc, char **argv)
parser
.
process
(
QApplication
::
arguments
());
aboutData
.
processCommandLine
(
&
parser
);
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
Kdelibs4ConfigMigrator
migrate
(
QStringLiteral
(
"kleopatra"
));
migrate
.
setConfigFiles
(
QStringList
()
<<
QStringLiteral
(
"kleopatrarc"
)
<<
QStringLiteral
(
"libkleopatrarc"
));
migrate
.
setUiFiles
(
QStringList
()
<<
QStringLiteral
(
"kleopatra.rc"
));
migrate
.
migrate
();
#endif
qCDebug
(
KLEOPATRA_LOG
)
<<
"Startup timing:"
<<
timer
.
elapsed
()
<<
"ms elapsed: Application created"
;
// Initialize GpgME
...
...
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