Fix compile with unity cmake support

messagecomposer/src/plugineditorinit/plugineditorinitmanager.cpp

@@ -31,7 +31,7 @@ public:
 
 namespace
 {
-QString pluginVersion()
+QString pluginEditorInitVersion()
 {
     return QStringLiteral("1.0");
 }
@@ -96,7 +96,7 @@ void PluginEditorInitManagerPrivate::initializePlugins()
         info.metaDataFileNameBaseName = QFileInfo(data.fileName()).baseName();
         info.metaDataFileName = data.fileName();
         info.data = data;
-        if (pluginVersion() == data.version()) {
+        if (pluginEditorInitVersion() == data.version()) {
             info.plugin = nullptr;
             mPluginList.push_back(info);
         } else {

messageviewer/src/messagepartthemes/default/messagepartrenderermanager.cpp

@@ -23,11 +23,9 @@
 #include <grantlee/templateloader.h>
 
 #include <QGuiApplication>
-#ifndef COMPILE_WITH_UNITY_CMAKE_SUPPORT
 Q_DECLARE_METATYPE(GpgME::DecryptionResult::Recipient)
 Q_DECLARE_METATYPE(const QGpgME::Protocol *)
 Q_DECLARE_METATYPE(GpgME::Key)
-#endif
 
 // Read-only introspection of GpgME::DecryptionResult::Recipient object.
 GRANTLEE_BEGIN_LOOKUP(GpgME::DecryptionResult::Recipient)