summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-09-07 11:25:44 (GMT)
committerMontel Laurent <montel@kde.org>2016-09-07 11:25:44 (GMT)
commit0e857aeb41eaf6f3a489c69dd9acae8a1c09effc (patch)
treedf5a0401efc166ed89676269481e8e8bdaea8b06
parenta98cd49e617d7959176127b5119b6b792368f876 (diff)
Use pluginId
-rw-r--r--CMakeLists.txt2
-rw-r--r--src/genericplugins/genericpluginmanager.cpp5
-rw-r--r--src/genericplugins/genericpluginmanager.h1
3 files changed, 5 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bf0dfba..cc30337 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@ include(ECMQtDeclareLoggingCategory)
include(ECMAddTests)
include(ECMInstallIcons)
-set(PIM_VERSION "5.3.42")
+set(PIM_VERSION "5.3.43")
set(PIMCOMMON_LIB_VERSION ${PIM_VERSION})
set(AKONADIMIME_LIB_VERSION "5.3.40")
diff --git a/src/genericplugins/genericpluginmanager.cpp b/src/genericplugins/genericpluginmanager.cpp
index fb0d298..31ecdbf 100644
--- a/src/genericplugins/genericpluginmanager.cpp
+++ b/src/genericplugins/genericpluginmanager.cpp
@@ -132,11 +132,12 @@ bool GenericPluginManagerPrivate::initializePlugins()
GenericPluginManager::GenericPluginData pluginData;
pluginData.mDescription = info.metaData.description();
pluginData.mName = info.metaData.name();
+ pluginData.mIdentifier = info.metaData.pluginId();
pluginData.mEnableByDefault = info.metaData.isEnabledByDefault();
mPluginDataList.append(pluginData);
- const bool pluginEnabledByUser = enabledPlugins.contains(info.metaData.name());
- const bool pluginDisabledByUser = disabledPlugins.contains(info.metaData.name());
+ const bool pluginEnabledByUser = enabledPlugins.contains(info.metaData.pluginId());
+ const bool pluginDisabledByUser = disabledPlugins.contains(info.metaData.pluginId());
if ((info.metaData.isEnabledByDefault() && !pluginDisabledByUser)
|| (!info.metaData.isEnabledByDefault() && pluginEnabledByUser)) {
if (pluginVersion() == info.metaData.version()) {
diff --git a/src/genericplugins/genericpluginmanager.h b/src/genericplugins/genericpluginmanager.h
index f37d856..f85d1cf 100644
--- a/src/genericplugins/genericpluginmanager.h
+++ b/src/genericplugins/genericpluginmanager.h
@@ -40,6 +40,7 @@ public:
}
QString mDescription;
QString mName;
+ QString mIdentifier;
bool mEnableByDefault;
};