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
KNotes
Commits
457a236b
Commit
457a236b
authored
Jan 13, 2022
by
Laurent Montel
Browse files
Use directly QT_VERSION
parent
ac31d21c
Pipeline
#122501
passed with stage
in 1 minute and 15 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
notesagent/notesagent.cpp
View file @
457a236b
...
...
@@ -13,8 +13,7 @@
#include
<Akonadi/ServerManager>
#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
...
...
@@ -24,7 +23,7 @@
NotesAgent
::
NotesAgent
(
const
QString
&
id
)
:
Akonadi
::
AgentBase
(
id
)
{
#if
KCOREADDONS
_VERSION < QT_VERSION_CHECK(6, 0, 0)
#if
QT
_VERSION < QT_VERSION_CHECK(6, 0, 0)
Kdelibs4ConfigMigrator
migrate
(
QStringLiteral
(
"notesagent"
));
migrate
.
setConfigFiles
(
QStringList
()
<<
QStringLiteral
(
"akonadi_notes_agentrc"
)
<<
QStringLiteral
(
"akonadi_notes_agent.notifyrc"
));
migrate
.
migrate
();
...
...
src/apps/main.cpp
View file @
457a236b
...
...
@@ -10,8 +10,7 @@
#include
"knotes-version.h"
#include
"knotes_debug.h"
#include
"knotes_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
"notes/knotesmigrateapplication.h"
#endif
#include
<KLocalizedString>
...
...
@@ -33,11 +32,11 @@ int main(int argc, char *argv[])
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
QCoreApplication
::
setAttribute
(
Qt
::
AA_EnableHighDpiScaling
,
true
);
#endif
QCoreApplication
::
setAttribute
(
Qt
::
AA_UseHighDpiPixmaps
,
true
);
#endif
Application
app
(
argc
,
&
argv
);
KCrash
::
initialize
();
#if
KCOREADDONS
_VERSION < QT_VERSION_CHECK(6, 0, 0)
#if
QT
_VERSION < QT_VERSION_CHECK(6, 0, 0)
KNotesMigrateApplication
migrate
;
migrate
.
migrate
();
#endif
...
...
src/configdialog/knoteconfigdialog.cpp
View file @
457a236b
...
...
@@ -13,7 +13,6 @@
#include
"notesharedglobalconfig.h"
#include
"print/knoteprintselectthemecombobox.h"
#include
<config-knotes.h>
#include
<kcoreaddons_version.h>
#include
<KAuthorized>
#include
<KNS3/DownloadDialog>
...
...
src/notes/knotesmigrateapplication.cpp
View file @
457a236b
...
...
@@ -4,7 +4,7 @@
SPDX-License-Identifier: GPL-2.0-or-later
*/
#include
"knotesmigrateapplication.h"
#if
KCOREADDONS
_VERSION < QT_VERSION_CHECK(6, 0, 0)
#if
QT
_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include
<Kdelibs4ConfigMigrator>
KNotesMigrateApplication
::
KNotesMigrateApplication
()
...
...
src/notes/knotesmigrateapplication.h
View file @
457a236b
...
...
@@ -5,8 +5,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
"knotes_export.h"
#include
<PimCommon/MigrateApplicationFiles>
...
...
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