Commit 7b382bfd 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 190ad7f0
...@@ -41,7 +41,12 @@ ...@@ -41,7 +41,12 @@
\*===========================================================================*/ \*===========================================================================*/
#include <QtGui> #if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include "SubdividerPlugin.hh" #include "SubdividerPlugin.hh"
...@@ -294,4 +299,8 @@ bool SubdividerPlugin::test_trimesh_object(int _identifier, BaseObjectData*& _ob ...@@ -294,4 +299,8 @@ bool SubdividerPlugin::test_trimesh_object(int _identifier, BaseObjectData*& _ob
return true; return true;
} }
Q_EXPORT_PLUGIN2( subdividerplugin , SubdividerPlugin ); #if QT_VERSION < 0x050000
Q_EXPORT_PLUGIN2( subdividerplugin , SubdividerPlugin );
#endif
...@@ -70,6 +70,10 @@ class SubdividerPlugin : public QObject, BaseInterface , ToolboxInterface, Loggi ...@@ -70,6 +70,10 @@ class SubdividerPlugin : public QObject, BaseInterface , ToolboxInterface, Loggi
Q_INTERFACES(ScriptInterface) Q_INTERFACES(ScriptInterface)
Q_INTERFACES(BackupInterface) Q_INTERFACES(BackupInterface)
#if QT_VERSION >= 0x050000
Q_PLUGIN_METADATA(IID "org.OpenFlipper.Plugins.Plugin-Subdivider")
#endif
signals: signals:
void updateView(); void updateView();
void updatedObject(int _id, const UpdateType& _type); void updatedObject(int _id, const UpdateType& _type);
......
...@@ -41,7 +41,13 @@ ...@@ -41,7 +41,13 @@
\*===========================================================================*/ \*===========================================================================*/
#include "ui_subdividerControls.hh" #include "ui_subdividerControls.hh"
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
class subdividerToolbarWidget : public QWidget, public Ui::SubdividerControls class subdividerToolbarWidget : public QWidget, public Ui::SubdividerControls
{ {
......
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