Commit bf390af0 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Fix install header

parent db646334
cmake_minimum_required(VERSION 3.0)
set(PIM_VERSION "5.10.40")
set(PIM_VERSION "5.10.41")
if (POLICY CMP0053)
cmake_policy(SET CMP0053 NEW)
......
......@@ -180,6 +180,7 @@ set(libmessageviewer_viewerplugins_SRCS
set(libmessageviewer_configureplugins_SRCS
messageviewerconfigureplugins/messageviewerconfiguresettingsplugin.cpp
messageviewerconfigureplugins/messageviewerconfiguresettingspluginmanager.cpp
)
set(libmessageviewer_messagepartthemes_default_SRCS
......@@ -380,6 +381,15 @@ ecm_generate_headers(MessageViewer_Camelcasesettings_HEADERS
RELATIVE settings
)
ecm_generate_headers(MessageViewer_CamelcaseConfigurePlugins_HEADERS
HEADER_NAMES
MessageViewerConfigureSettingsPluginManager
MessageViewerConfigureSettingsPlugin
REQUIRED_HEADERS MessageViewer_ConfigurePlugins_HEADERS
PREFIX MessageViewer
RELATIVE messageviewerconfigureplugins
)
ecm_generate_headers(MessageViewer_Camelcaseheader_HEADERS
HEADER_NAMES
......@@ -429,6 +439,7 @@ ecm_generate_pri_file(BASE_NAME MessageViewer
install(FILES
${MessageViewer_CamelcaseConfigurePlugins_HEADERS}
${MessageViewer_Camelcasewebengine_HEADERS}
${MessageViewer_Camelcaseheader_HEADERS}
${MessageViewer_Camelcaseviewerplugin_HEADERS}
......@@ -447,6 +458,7 @@ install(FILES
)
install(FILES
${MessageViewer_ConfigurePlugins_HEADERS}
${MessageViewer_webengine_HEADERS}
${MessageViewer_scam_HEADERS}
${MessageViewer_viewerplugin_HEADERS}
......
......@@ -56,7 +56,6 @@ public:
void loadPlugin(ConfigureSettingsPluginInfo *item);
QString configGroupName() const;
QString configPrefixSettingKey() const;
MessageViewer::MessageViewerConfigureSettingsPlugin *pluginFromIdentifier(const QString &id);
private:
QVector<PimCommon::PluginUtilData> mPluginDataList;
QVector<ConfigureSettingsPluginInfo> mPluginList;
......@@ -177,19 +176,6 @@ void MessageViewerConfigureSettingsPluginManagerPrivate::loadPlugin(ConfigureSet
}
}
MessageViewer::MessageViewerConfigureSettingsPlugin *MessageViewerConfigureSettingsPluginManagerPrivate::pluginFromIdentifier(
const QString &id)
{
QVector<ConfigureSettingsPluginInfo>::ConstIterator end(mPluginList.constEnd());
for (QVector<ConfigureSettingsPluginInfo>::ConstIterator it = mPluginList.constBegin(); it != end;
++it) {
if ((*it).pluginData.mIdentifier == id) {
return (*it).plugin;
}
}
return {};
}
MessageViewerConfigureSettingsPluginManager *MessageViewerConfigureSettingsPluginManager::self()
{
static MessageViewerConfigureSettingsPluginManager s_self;
......@@ -213,16 +199,6 @@ QVector<MessageViewer::MessageViewerConfigureSettingsPlugin *> MessageViewerConf
return d->pluginsList();
}
QStringList MessageViewerConfigureSettingsPluginManager::pluginListName() const
{
QStringList lst;
lst.reserve(d->pluginsList().count());
for (MessageViewer::MessageViewerConfigureSettingsPlugin *plugin : d->pluginsList()) {
lst << plugin->name();
}
return lst;
}
QString MessageViewerConfigureSettingsPluginManager::configGroupName() const
{
return d->configGroupName();
......
......@@ -36,7 +36,6 @@ public:
~MessageViewerConfigureSettingsPluginManager();
Q_REQUIRED_RESULT QVector<MessageViewer::MessageViewerConfigureSettingsPlugin *> pluginsList() const;
Q_REQUIRED_RESULT QStringList pluginListName() const;
Q_REQUIRED_RESULT QVector<PimCommon::PluginUtilData> pluginsDataList() const;
Q_REQUIRED_RESULT QString configPrefixSettingKey() const;
......
Markdown is supported
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