Commit c8c180e7 authored by Matthias Möller's avatar Matthias Möller
Browse files

- 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 f21dc6a3
...@@ -460,7 +460,6 @@ void MeshComparePlugin::visualizeData( const std::vector<double>& _data, double ...@@ -460,7 +460,6 @@ void MeshComparePlugin::visualizeData( const std::vector<double>& _data, double
} }
#if QT_VERSION < 0x050000
Q_EXPORT_PLUGIN2( meshcompareplugin , MeshComparePlugin );
Q_EXPORT_PLUGIN2( meshcompareplugin , MeshComparePlugin ); #endif
...@@ -74,6 +74,10 @@ class MeshComparePlugin : public QObject, BaseInterface, ToolboxInterface, Loggi ...@@ -74,6 +74,10 @@ class MeshComparePlugin : public QObject, BaseInterface, ToolboxInterface, Loggi
Q_INTERFACES(TextureInterface) Q_INTERFACES(TextureInterface)
Q_INTERFACES(RPCInterface) Q_INTERFACES(RPCInterface)
#if QT_VERSION >= 0x050000
Q_PLUGIN_METADATA(IID "org.OpenFlipper.Plugins.Plugin-MeshCompare")
#endif
signals: signals:
//BaseInterface //BaseInterface
void updateView(); void updateView();
......
...@@ -41,7 +41,13 @@ ...@@ -41,7 +41,13 @@
\*===========================================================================*/ \*===========================================================================*/
#include "ui_MeshCompareToolbar.hh" #include "ui_MeshCompareToolbar.hh"
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
class MeshCompareToolbarWidget : public QWidget, public Ui::MeshCompareToolbar class MeshCompareToolbarWidget : public QWidget, public Ui::MeshCompareToolbar
{ {
......
...@@ -60,7 +60,13 @@ ...@@ -60,7 +60,13 @@
//== INCLUDES ================================================================= //== INCLUDES =================================================================
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <qwt_plot.h> #include <qwt_plot.h>
#include <qwt_plot_curve.h> #include <qwt_plot_curve.h>
#include <qwt_plot_zoomer.h> #include <qwt_plot_zoomer.h>
......
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