Commit d7d1e9b9 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 fc3dbdb0
...@@ -40,7 +40,12 @@ ...@@ -40,7 +40,12 @@
* * * *
\*===========================================================================*/ \*===========================================================================*/
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include "MovePlugin.hh" #include "MovePlugin.hh"
...@@ -2297,5 +2302,7 @@ void MovePlugin::objectDeleted( int _id ){ ...@@ -2297,5 +2302,7 @@ void MovePlugin::objectDeleted( int _id ){
//-------------------------------------------------------------------------------- //--------------------------------------------------------------------------------
Q_EXPORT_PLUGIN2( moveplugin , MovePlugin ); #if QT_VERSION < 0x050000
Q_EXPORT_PLUGIN2( moveplugin , MovePlugin );
#endif
...@@ -89,6 +89,10 @@ class MovePlugin : public QObject, BaseInterface, MouseInterface, KeyInterface, ...@@ -89,6 +89,10 @@ class MovePlugin : public QObject, BaseInterface, MouseInterface, KeyInterface,
Q_INTERFACES(LoadSaveInterface) Q_INTERFACES(LoadSaveInterface)
Q_INTERFACES(RPCInterface) Q_INTERFACES(RPCInterface)
#if QT_VERSION >= 0x050000
Q_PLUGIN_METADATA(IID "org.OpenFlipper.Plugins.Plugin-Move")
#endif
public: public:
typedef unsigned int SelectionType; typedef unsigned int SelectionType;
static const SelectionType VERTEX = 1; static const SelectionType VERTEX = 1;
......
...@@ -41,7 +41,13 @@ ...@@ -41,7 +41,13 @@
\*===========================================================================*/ \*===========================================================================*/
#include "ui_setProps.hh" #include "ui_setProps.hh"
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <OpenFlipper/BasePlugin/PluginFunctions.hh> #include <OpenFlipper/BasePlugin/PluginFunctions.hh>
......
...@@ -41,7 +41,12 @@ ...@@ -41,7 +41,12 @@
\*===========================================================================*/ \*===========================================================================*/
#include "ui_moveControls.hh" #include "ui_moveControls.hh"
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
class moveToolbarWidget : public QWidget, public Ui::moveControls class moveToolbarWidget : public QWidget, public Ui::moveControls
{ {
......
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