Merge branch 'master' into script-upgrade

21574fa3 · Jascha Wedowski · 6d36f4ea · 05ed4b6a · 21574fa3 · 21574fa3
Commit 21574fa3 authored Jun 11, 2018 by Jascha Wedowski
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 9 deletions

types/objectId/TreeModel.cc types/objectId/TreeModel.cc +1 -4

vsiPlugin.cc vsiPlugin.cc +0 -3

vsiPlugin.hh vsiPlugin.hh +0 -2

No files found.
--- a/types/objectId/TreeModel.cc
+++ b/types/objectId/TreeModel.cc
@@ -54,11 +54,8 @@

 #include <OpenFlipper/BasePlugin/PluginFunctions.hh>

-#if QT_VERSION >= 0x050000
+
 #include <QtWidgets>
-#else
-#include <QtGui>
-#endif


 //******************************************************************************

--- a/vsiPlugin.cc
+++ b/vsiPlugin.cc
@@ -298,6 +298,3 @@ bool VsiPlugin::continueBox (QString _message)

 //------------------------------------------------------------------------------

-#if QT_VERSION < 0x050000
-  Q_EXPORT_PLUGIN2(Vsiplugin,VsiPlugin)
-#endif
--- a/vsiPlugin.hh
+++ b/vsiPlugin.hh
@@ -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: