Skip to content
Snippets Groups Projects
Commit c0b13863 authored by hjk's avatar hjk
Browse files

Fixes: use less static variables in patchedpluginloader.cpp

Details: confused designer plugins
parent 9a70ea18
No related branches found
No related tags found
No related merge requests found
...@@ -114,8 +114,6 @@ public: ...@@ -114,8 +114,6 @@ public:
QObject *instance(); QObject *instance();
static QObjectList staticInstances();
bool load(); bool load();
bool unload(); bool unload();
bool isLoaded() const; bool isLoaded() const;
...@@ -831,9 +829,6 @@ QString PatchedPluginLoader::errorString() const ...@@ -831,9 +829,6 @@ QString PatchedPluginLoader::errorString() const
return (!d || d->errorString.isEmpty()) ? QLibrary::tr("Unknown error") : d->errorString; return (!d || d->errorString.isEmpty()) ? QLibrary::tr("Unknown error") : d->errorString;
} }
typedef QList<QtPluginInstanceFunction> StaticInstanceFunctionList;
Q_GLOBAL_STATIC(StaticInstanceFunctionList, staticInstanceFunctionList)
void PatchedPluginLoader::setLoadHints(QLibrary::LoadHints loadHints) void PatchedPluginLoader::setLoadHints(QLibrary::LoadHints loadHints)
{ {
if (!d) { if (!d) {
...@@ -853,24 +848,6 @@ QLibrary::LoadHints PatchedPluginLoader::loadHints() const ...@@ -853,24 +848,6 @@ QLibrary::LoadHints PatchedPluginLoader::loadHints() const
return d->loadHints; return d->loadHints;
} }
void qRegisterStaticPluginInstanceFunction(QtPluginInstanceFunction function)
{
staticInstanceFunctionList()->append(function);
}
QObjectList PatchedPluginLoader::staticInstances()
{
QObjectList instances;
StaticInstanceFunctionList *functions = staticInstanceFunctionList();
if (functions) {
for (int i = 0; i < functions->count(); ++i)
instances.append((*functions)[i]());
}
return instances;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment