Commit 4d564504 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Fix some compile error against qt6

parent 08269f29
Pipeline #180659 passed with stage
in 4 minutes and 9 seconds
......@@ -3,6 +3,7 @@
add_definitions(-DTRANSLATION_DOMAIN=\"akonadi_archivemail_agent\")
add_library(archivemailagent STATIC)
set_property(TARGET archivemailagent PROPERTY POSITION_INDEPENDENT_CODE ON)
target_sources(archivemailagent PRIVATE
archivemailkernel.cpp
archivemailmanager.cpp
......
......@@ -3,7 +3,7 @@
add_definitions(-DTRANSLATION_DOMAIN=\"akonadi_followupreminder_agent\")
add_library(followupreminderagent STATIC)
set_property(TARGET followupreminderagent PROPERTY POSITION_INDEPENDENT_CODE ON)
......
......@@ -7,6 +7,7 @@ if(BUILD_TESTING)
add_subdirectory(autotests)
endif()
add_library(mailmergeagent STATIC)
set_property(TARGET mailmergeagent PROPERTY POSITION_INDEPENDENT_CODE ON)
ecm_qt_declare_logging_category(mailmergeagent HEADER mailmergeagent_debug.h IDENTIFIER MAILMERGEAGENT_LOG CATEGORY_NAME org.kde.pim.mailmergeagent
......
......@@ -42,6 +42,8 @@ qt_add_dbus_adaptor(sendlateragent_SRCS org.freedesktop.Akonadi.SendLaterAgent.x
ki18n_wrap_ui(libsendlateragent_SRCS ui/sendlaterconfigurewidget.ui)
kconfig_add_kcfg_files(libsendlateragent_SRCS sendlateragentsettings.kcfgc)
add_library(sendlateragent STATIC ${libsendlateragent_SRCS})
set_property(TARGET sendlateragent PROPERTY POSITION_INDEPENDENT_CODE ON)
pim_target_precompile_headers(sendlateragent PUBLIC ../../kmail_pch.h)
#if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
# set_target_properties(sendlateragent PROPERTIES UNITY_BUILD ON)
......
......@@ -8,6 +8,7 @@
#include <QByteArray>
#include <QDataStream>
#include <QIODevice>
TaskAttribute::TaskAttribute()
: Akonadi::Attribute()
......
......@@ -12,6 +12,7 @@
#include <QAction>
#include <QVector>
#include <QWidget>
KMailPluginEditorManagerInterface::KMailPluginEditorManagerInterface(QObject *parent)
: QObject(parent)
......
......@@ -45,7 +45,10 @@ KMMainWin::KMMainWin(QWidget *)
setObjectName(QStringLiteral("kmail-mainwindow#"));
// Set this to be the group leader for all subdialogs - this means
// modal subdialogs will only affect this dialog, not the other windows
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
// TODO verify on qt6
setAttribute(Qt::WA_GroupLeader);
#endif
resize(700, 500); // The default size
......
......@@ -5,10 +5,10 @@
*/
#pragma once
#include <PimCommon/MigrateApplicationFiles>
#include <QtGlobal>
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include "kmail_export.h"
#include <PimCommon/MigrateApplicationFiles>
class KMAIL_EXPORT KMMigrateApplication
{
public:
......
......@@ -7,6 +7,7 @@
#include "searchdescriptionattribute.h"
#include <QDataStream>
#include <QIODevice>
using namespace Akonadi;
......
......@@ -22,7 +22,10 @@ SecondaryWindow::SecondaryWindow(const QString &name)
setObjectName(name);
// Set this to be the group leader for all subdialogs - this means
// modal subdialogs will only affect this window, not the other windows
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
// TODO verify in qt6
setAttribute(Qt::WA_GroupLeader);
#endif
}
//---------------------------------------------------------------------------
......
......@@ -9,6 +9,7 @@
#include <KLocalizedString>
#include <KToggleAction>
#include <QAction>
#include <QActionGroup>
#include <QMenu>
DisplayMessageFormatActionMenu::DisplayMessageFormatActionMenu(QObject *parent)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment