Commit 97feebaf 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 3cb95189
...@@ -40,7 +40,12 @@ ...@@ -40,7 +40,12 @@
* * * *
\*===========================================================================*/ \*===========================================================================*/
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include "MeshRepairPlugin.hh" #include "MeshRepairPlugin.hh"
...@@ -385,4 +390,8 @@ void MeshRepairPlugin::pluginsInitialized() { ...@@ -385,4 +390,8 @@ void MeshRepairPlugin::pluginsInitialized() {
} }
Q_EXPORT_PLUGIN2( meshrepairplugin , MeshRepairPlugin ); #if QT_VERSION < 0x050000
Q_EXPORT_PLUGIN2( meshrepairplugin , MeshRepairPlugin );
#endif
...@@ -68,6 +68,10 @@ class MeshRepairPlugin : public QObject, BaseInterface , ToolboxInterface, Backu ...@@ -68,6 +68,10 @@ class MeshRepairPlugin : public QObject, BaseInterface , ToolboxInterface, Backu
Q_INTERFACES(ScriptInterface) Q_INTERFACES(ScriptInterface)
Q_INTERFACES(RPCInterface) Q_INTERFACES(RPCInterface)
#if QT_VERSION >= 0x050000
Q_PLUGIN_METADATA(IID "org.OpenFlipper.Plugins.Plugin-MeshRepair")
#endif
signals: signals:
void updateView(); void updateView();
......
...@@ -41,7 +41,13 @@ ...@@ -41,7 +41,13 @@
\*===========================================================================*/ \*===========================================================================*/
#include "ui_MeshRepairControls.hh" #include "ui_MeshRepairControls.hh"
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
class MeshRepairToolbarWidget : public QWidget, public Ui::MeshRepairControls class MeshRepairToolbarWidget : public QWidget, public Ui::MeshRepairControls
{ {
......
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