Commit e174d779 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 4aaeb839
...@@ -49,7 +49,12 @@ ...@@ -49,7 +49,12 @@
//== INCLUDES ================================================================= //== INCLUDES =================================================================
#include <QtGui> #if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include "MeshObjectInfoPlugin.hh" #include "MeshObjectInfoPlugin.hh"
...@@ -873,6 +878,8 @@ void InfoMeshObjectPlugin::slotAllCleared(){ ...@@ -873,6 +878,8 @@ void InfoMeshObjectPlugin::slotAllCleared(){
infoBar_->hideCounts(); infoBar_->hideCounts();
} }
Q_EXPORT_PLUGIN2( InfoMeshObjectPlugin , InfoMeshObjectPlugin ); #if QT_VERSION < 0x050000
Q_EXPORT_PLUGIN2( InfoMeshObjectPlugin , InfoMeshObjectPlugin );
#endif
...@@ -81,6 +81,9 @@ class InfoMeshObjectPlugin : public QObject, BaseInterface, InformationInterface ...@@ -81,6 +81,9 @@ class InfoMeshObjectPlugin : public QObject, BaseInterface, InformationInterface
Q_INTERFACES(LoggingInterface) Q_INTERFACES(LoggingInterface)
Q_INTERFACES(StatusbarInterface) Q_INTERFACES(StatusbarInterface)
#if QT_VERSION >= 0x050000
Q_PLUGIN_METADATA(IID "org.OpenFlipper.Plugins.Plugin-MeshObjectInfo")
#endif
signals: signals:
// BaseInterface // BaseInterface
......
...@@ -41,7 +41,13 @@ ...@@ -41,7 +41,13 @@
\*===========================================================================*/ \*===========================================================================*/
#include "ui_infoBar.hh" #include "ui_infoBar.hh"
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
class InfoBar : public QWidget, public Ui::InfoBar class InfoBar : public QWidget, public Ui::InfoBar
{ {
......
...@@ -41,7 +41,13 @@ ...@@ -41,7 +41,13 @@
\*===========================================================================*/ \*===========================================================================*/
#include "ui_infoWidget.hh" #include "ui_infoWidget.hh"
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
class InfoDialog : public QDialog, public Ui::InfoWidget class InfoDialog : public QDialog, public Ui::InfoWidget
{ {
......
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