Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OpenFlipper-Free
OpenFlipper
Commits
d5cffe97
Commit
d5cffe97
authored
Nov 24, 2015
by
Hans-Christian Ebke
Browse files
Making static plugin changes safe for Qt < 5.
parent
146a4e5e
Changes
1
Show whitespace changes
Inline
Side-by-side
Core/PluginLoader.cc
View file @
d5cffe97
...
...
@@ -71,6 +71,9 @@
#include
<QtScript/QScriptValueIterator>
#include
<QThread>
#include
<QMutexLocker>
#if QT_VERSION >= 0x050000
#include
<QStaticPlugin>
#endif
#include
<QPluginLoader>
#include
"OpenFlipper/BasePlugin/BaseInterface.hh"
...
...
@@ -344,6 +347,7 @@ void Core::loadPlugins()
// Prepend the additional Plugins to the plugin list
pluginlist
=
additionalPlugins
<<
pluginlist
;
#if QT_VERSION >= 0x050000
/*
* Remove static plugins from dynamically loaded list.
*/
...
...
@@ -361,6 +365,7 @@ void Core::loadPlugins()
}
}
}
#endif
/*
* Note: This call is not necessary, anymore. Initialization order
...
...
@@ -456,6 +461,7 @@ void Core::loadPlugins()
delete
*
it
;
}
#if QT_VERSION >= 0x050000
/*
* Initialize static plugins.
*/
...
...
@@ -473,6 +479,7 @@ void Core::loadPlugins()
licenseTexts
+=
pluginLicenseText
;
}
}
#endif
emit
log
(
LOGINFO
,
tr
(
"Total time needed to load plugins was %1 ms."
).
arg
(
time
.
elapsed
()));
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment