diff options
| author | Silarn <jrim@rimpo.org> | 2019-01-18 01:56:16 -0600 |
|---|---|---|
| committer | Silarn <jrim@rimpo.org> | 2019-01-18 01:56:16 -0600 |
| commit | 077a050e5954cc21ce40c45dd51973d636b3779b (patch) | |
| tree | 9e9ceea5e54acf65f560250e1aa842a60bb34b66 /src/settings.h | |
| parent | e35cdd6c89ea27dfb8f3ea1f918192514617a64d (diff) | |
| parent | 0d04ba18737385395d6ebcdfe49fb31bcb539038 (diff) | |
Merge remote-tracking branch 'origin/Develop' into archive_conflicts_2
Diffstat (limited to 'src/settings.h')
| -rw-r--r-- | src/settings.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/settings.h b/src/settings.h index f88f9652..0286d4db 100644 --- a/src/settings.h +++ b/src/settings.h @@ -555,8 +555,8 @@ private: std::vector<MOBase::IPlugin*> m_Plugins; - QMap<QString, QMap<QString, QVariant>> m_PluginSettings; - QMap<QString, QMap<QString, QVariant>> m_PluginDescriptions; + QMap<QString, QVariantMap> m_PluginSettings; + QMap<QString, QVariantMap> m_PluginDescriptions; QSet<QString> m_PluginBlacklist; |