Commit d1b60a1f authored by Matthias Möller's avatar Matthias Möller

- adding qt5 pluginsystem

- adding qt5 headers

refs #1359

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@17080 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 567caf52
......@@ -200,5 +200,7 @@ void SlicePlugin::getBoundingBox(ACG::Vec3d& bbmin, ACG::Vec3d& bbmax){
}
Q_EXPORT_PLUGIN2( slicePlugin , SlicePlugin );
#if QT_VERSION < 0x050000
Q_EXPORT_PLUGIN2( slicePlugin , SlicePlugin );
#endif
......@@ -44,7 +44,12 @@
#define SLICEPLUGIN_HH
#include <QObject>
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <OpenFlipper/BasePlugin/BaseInterface.hh>
#include <OpenFlipper/BasePlugin/ToolboxInterface.hh>
......@@ -62,6 +67,10 @@ Q_INTERFACES(BaseInterface)
Q_INTERFACES(ToolboxInterface)
Q_INTERFACES(LoggingInterface)
#if QT_VERSION >= 0x050000
Q_PLUGIN_METADATA(IID "org.OpenFlipper.Plugins.Plugin-Slice")
#endif
//BaseInterface
signals:
void updateView();
......
......@@ -41,7 +41,13 @@
\*===========================================================================*/
#include "ui_toolbox.hh"
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
class SliceToolBox : public QWidget, public Ui::SliceTool
{
......
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