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
KOrganizer
Commits
e096a853
Commit
e096a853
authored
Jan 13, 2022
by
Laurent Montel
Browse files
Use directly QT_VERSION
parent
27ecd448
Pipeline
#122502
passed with stage
in 2 minutes and 14 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
korgac/korgacmain.cpp
View file @
e096a853
...
...
@@ -13,8 +13,7 @@
#include
<KDBusService>
#include
<KLocalizedString>
#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
<QApplication>
...
...
@@ -27,7 +26,7 @@ int main(int argc, char **argv)
QCoreApplication
::
setAttribute
(
Qt
::
AA_UseHighDpiPixmaps
,
true
);
#endif
QApplication
app
(
argc
,
argv
);
#if
KCOREADDONS
_VERSION < QT_VERSION_CHECK(6, 0, 0)
#if
QT
_VERSION < QT_VERSION_CHECK(6, 0, 0)
Kdelibs4ConfigMigrator
migrate
(
QStringLiteral
(
"korgac"
));
migrate
.
setConfigFiles
(
QStringList
()
<<
QStringLiteral
(
"korgacrc"
));
...
...
src/korganizer_part.cpp
View file @
e096a853
...
...
@@ -18,8 +18,7 @@
#include
<KCalUtils/IncidenceFormatter>
#include
"korganizer_debug.h"
#include
<kcoreaddons_version.h>
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include
"korgmigrateapplication.h"
#endif
#include
<KParts/StatusBarExtension>
...
...
@@ -32,7 +31,7 @@ K_PLUGIN_FACTORY(KOrganizerFactory, registerPlugin<KOrganizerPart>();)
KOrganizerPart
::
KOrganizerPart
(
QWidget
*
parentWidget
,
QObject
*
parent
,
const
QVariantList
&
)
:
KParts
::
ReadOnlyPart
(
parent
)
{
#if
KCOREADDONS
_VERSION < QT_VERSION_CHECK(6, 0, 0)
#if
QT
_VERSION < QT_VERSION_CHECK(6, 0, 0)
KOrgMigrateApplication
migrate
;
migrate
.
migrate
();
#endif
...
...
src/korgmigrateapplication.cpp
View file @
e096a853
...
...
@@ -5,7 +5,7 @@
*/
#include
"korgmigrateapplication.h"
#if
KCOREADDONS
_VERSION < QT_VERSION_CHECK(6, 0, 0)
#if
QT
_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include
<Kdelibs4ConfigMigrator>
KOrgMigrateApplication
::
KOrgMigrateApplication
()
...
...
src/korgmigrateapplication.h
View file @
e096a853
...
...
@@ -6,8 +6,7 @@
#pragma once
#include
<QObject>
#include
<kcoreaddons_version.h>
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include
"korganizerprivate_export.h"
#include
<PimCommon/MigrateApplicationFiles>
...
...
src/main.cpp
View file @
e096a853
...
...
@@ -12,8 +12,7 @@
#include
"korganizer.h"
#include
"korganizer_debug.h"
#include
"korganizer_options.h"
#include
<kcoreaddons_version.h>
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include
"korgmigrateapplication.h"
#endif
#include
<KCrash>
...
...
@@ -31,7 +30,7 @@ int main(int argc, char **argv)
KOrganizerApp
app
(
argc
,
&
argv
);
KCrash
::
initialize
();
KLocalizedString
::
setApplicationDomain
(
"korganizer"
);
#if
KCOREADDONS
_VERSION < QT_VERSION_CHECK(6, 0, 0)
#if
QT
_VERSION < QT_VERSION_CHECK(6, 0, 0)
KOrgMigrateApplication
migrate
;
migrate
.
migrate
();
#endif
...
...
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