Commit 21574fa3 authored by Jascha Wedowski's avatar Jascha Wedowski

Merge branch 'master' into script-upgrade

parents 6d36f4ea 05ed4b6a
......@@ -54,11 +54,8 @@
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
//******************************************************************************
......
......@@ -298,6 +298,3 @@ bool VsiPlugin::continueBox (QString _message)
//------------------------------------------------------------------------------
#if QT_VERSION < 0x050000
Q_EXPORT_PLUGIN2(Vsiplugin,VsiPlugin)
#endif
......@@ -78,9 +78,7 @@ class VsiPlugin : public QObject, BaseInterface, MenuInterface, ScriptInterface,
Q_INTERFACES(ScriptInterface)
Q_INTERFACES(RPCInterface)
#if QT_VERSION >= 0x050000
Q_PLUGIN_METADATA(IID "org.OpenFlipper.Plugins.Plugin-VSI")
#endif
signals:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment