Commit 6d093116 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 28ad0ff1
......@@ -49,7 +49,13 @@
//== INCLUDES =================================================================
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include "SkeletonObjectInfoPlugin.hh"
......@@ -227,7 +233,7 @@ void InfoSkeletonObjectPlugin::slotInformationRequested(const QPoint _clickedPoi
}
}
Q_EXPORT_PLUGIN2( infoskeletonobjectplugin , InfoSkeletonObjectPlugin );
#if QT_VERSION < 0x050000
Q_EXPORT_PLUGIN2( infoskeletonobjectplugin , InfoSkeletonObjectPlugin );
#endif
......@@ -79,6 +79,10 @@ class InfoSkeletonObjectPlugin : public QObject, BaseInterface, InformationInter
Q_INTERFACES(LoggingInterface)
Q_INTERFACES(StatusbarInterface)
#if QT_VERSION >= 0x050000
Q_PLUGIN_METADATA(IID "org.OpenFlipper.Plugins.Plugin-SkeletonObjectInfo")
#endif
signals:
......
......@@ -41,7 +41,12 @@
\*===========================================================================*/
#include "ui_infoSkeletonWidget.hh"
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
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