Commit 7a5feaaf 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 87a8ac3a
......@@ -301,5 +301,7 @@ void PropertyVisPlugin::slotRemoveProperty()
}
}
Q_EXPORT_PLUGIN2( propertyvisplugin , PropertyVisPlugin );
#if QT_VERSION < 0x050000
Q_EXPORT_PLUGIN2( propertyvisplugin , PropertyVisPlugin );
#endif
......@@ -89,6 +89,10 @@ class PropertyVisPlugin : public QObject, BaseInterface, LoadSaveInterface, Tool
Q_INTERFACES(PickingInterface)
Q_INTERFACES(LoggingInterface)
#if QT_VERSION >= 0x050000
Q_PLUGIN_METADATA(IID "org.OpenFlipper.Plugins.Plugin-PropertyVis")
#endif
signals:
void updateView();
void updatedObject(int, const UpdateType&);
......
......@@ -41,7 +41,13 @@
\*===========================================================================*/
#include "ui_PropertyVisToolbarBase.hh"
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
class PropertyVisToolbar : public QWidget, public Ui::PropertyVisToolbarBase
{
......
......@@ -44,7 +44,13 @@
#define BOOLEAN_WIDGET_HH
#include "ui_BooleanWidget.hh"
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
class BooleanWidget : public QWidget, public Ui::BooleanWidget
{
......
......@@ -44,7 +44,13 @@
#define DOUBLE_WIDGET_HH
#include "ui_DoubleWidget.hh"
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
class DoubleWidget : public QWidget, public Ui::DoubleWidget
{
......
......@@ -44,7 +44,13 @@
#define INTEGER_WIDGET_HH
#include "ui_IntegerWidget.hh"
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
class IntegerWidget : public QWidget, public Ui::IntegerWidget
{
......
......@@ -44,7 +44,13 @@
#define LOAD_SAVE_WIDGET_HH
#include "ui_LoadSaveWidget.hh"
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
class LoadSaveWidget : public QWidget, public Ui::LoadSaveWidget
{
......
......@@ -44,7 +44,13 @@
#define PICK_WIDGET_HH
#include "ui_PickWidget.hh"
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
class PickWidget : public QWidget, public Ui::PickWidget
{
......
......@@ -44,7 +44,13 @@
#define SKIN_WEIGHTS_WIDGET_HH
#include "ui_SkinWeightsWidget.hh"
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
class SkinWeightsWidget : public QWidget, public Ui::SkinWeightsWidget
{
......
......@@ -44,7 +44,13 @@
#define VECTOR_FIELD_DIFFERENCE_WIDGET_HH
#include "ui_VectorFieldDifferenceWidget.hh"
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
class VectorFieldDifferenceWidget : public QWidget, public Ui::VectorFieldDifferenceWidget
{
......
......@@ -44,7 +44,13 @@
#define VECTOR_WIDGET_HH
#include "ui_VectorWidget.hh"
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
class VectorWidget : public QWidget, public Ui::VectorWidget
{
......
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