Fix some compile error when trying to build against qt6

src/mail/mailmanager.cpp

@@ -2,11 +2,9 @@
 // SPDX-License-Identifier: LGPL-2.0-or-later
 
 #include "mailmanager.h"
-#include "mailmodel.h"
 
 // Akonadi
 #include <Akonadi/ChangeRecorder>
-#include <Akonadi/CollectionFilterProxyModel>
 #include <Akonadi/EntityMimeTypeFilterModel>
 #include <Akonadi/EntityTreeModel>
 #include <Akonadi/ItemFetchScope>

src/mail/mailmanager.h

 // SPDX-FileCopyrightText: 2020 Carl Schwan <carlschwan@kde.org>
 // SPDX-License-Identifier: LGPL-2.0-or-later
 
+#include "mailmodel.h"
+#include <Akonadi/CollectionFilterProxyModel>
 #include <QObject>
-
 namespace Akonadi
 {
 class CollectionFilterProxyModel;
@@ -11,8 +12,6 @@ class Session;
 
 class QItemSelectionModel;
 
-class MailModel;
-
 /// Class responsible for exposing the email folder selected by the user
 class MailManager : public QObject
 {

src/mail/mime/tests/CMakeLists.txt

@@ -11,6 +11,6 @@ add_executable(mailtemplatetest mailtemplatetest.cpp)
 
 add_gpg_crypto_test(mailtemplatetest mailtemplatetest)
 target_link_libraries(mailtemplatetest
-    Qt5::Test
+    Qt::Test
     kalendar_mail_static
 )

src/mail/mimetreeparser/autotests/CMakeLists.txt

@@ -11,7 +11,7 @@ include(${CMAKE_SOURCE_DIR}/cmake/modules/add_gpg_crypto_test.cmake)
 function(add_mimetreeparser_class_unittest _name _additionalSource)
     add_executable(${_name} ${_name}.cpp setupenv.cpp ${_additionalSource})
     target_link_libraries(${_name} PRIVATE
-        Qt5::Test
+        Qt::Test
         kalendar_mail_static
     )
     target_include_directories(${_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/..)
@@ -30,7 +30,7 @@ function(add_mimetreeparser_crypto_unittest _name)
         ${GPGME_INCLUDE_DIRS}
     )
     target_link_libraries(${_name} PRIVATE
-        Qt5::Test
+        Qt::Test
         kalendar_mail_static
     )
     add_gpg_crypto_test(${_name} mimetreeparser-${_name})

src/mail/mimetreeparser/tests/CMakeLists.txt

@@ -15,13 +15,13 @@ include(ECMAddTests)
 add_executable(mimetreeparsertest mimetreeparsertest.cpp)
 add_gpg_crypto_test(mimetreeparsertest mimetreeparsertest)
 target_link_libraries(mimetreeparsertest PUBLIC
-    Qt5::Test
+    Qt::Test
     kalendar_mail_static
 )
 
 add_executable(gpgerrortest gpgerrortest.cpp)
 target_link_libraries(gpgerrortest PUBLIC
-    Qt5::Test
+    Qt::Test
     kalendar_mail_static
 )
 add_test(NAME gpgerrortest COMMAND $<TARGET_FILE:gpgerrortest>)

src/mail/tests/CMakeLists.txt

@@ -11,6 +11,6 @@ target_include_directories(cryptotest PRIVATE
 )
 add_gpg_crypto_test(cryptotest cryptotest)
 target_link_libraries(cryptotest
-    Qt5::Test
+    Qt::Test
     kalendar_mail_static
 )