ITsolved/prodejna
2
0
Fork 0
Code Issues 8 Pull Requests Releases Wiki Activity

Merge branch 'master' of https://git.bukova.info/repos/git/prodejna

Browse Source
This commit is contained in:
pepa
2016-02-13 21:52:33 +01:00
parent 1f4f318a26 7ea06881ef
commit 1bb87dcb20
19 changed files with 337 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/context.cpp
+3 -3
View File
@@ -49,7 +49,7 @@ void Context::loadPlugins()
m_plugins.append(new Users);
m_plugins.append(new Roles);
QDir pluginsDir(qApp->applicationDirPath() + "/../plugins");
QDir pluginsDir(qApp->applicationDirPath() + "/../../plugins");
foreach (QString fileName, pluginsDir.entryList(QStringList() << "*.so" << "*.dll")) {
QPluginLoader pluginLoader(pluginsDir.absoluteFilePath(fileName));
@@ -96,10 +96,10 @@ void Context::destroy()
m_dbOpened = false;
}
if (m_settings != NULL && m_settings->parent() == NULL)
/*if (m_settings != NULL && m_settings->parent() == NULL)
{
delete m_settings;
}
}*/
foreach (IPlugin *plugin, m_plugins)
{