Commit 4929f492 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 2104b1ca
......@@ -50,7 +50,13 @@
//== INCLUDES =================================================================
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <memory>
#include "DecimaterPlugin.hh"
......@@ -913,5 +919,6 @@ void DecimaterPlugin::slotUpdateDistance()
tool_->cbDistance->setChecked (true);
}
Q_EXPORT_PLUGIN2(DecimaterPlugin , DecimaterPlugin );
#if QT_VERSION < 0x050000
Q_EXPORT_PLUGIN2(DecimaterPlugin , DecimaterPlugin );
#endif
......@@ -98,6 +98,9 @@ class DecimaterPlugin : public QObject, BaseInterface, ToolboxInterface, Logging
Q_INTERFACES(RPCInterface)
Q_INTERFACES(LoadSaveInterface)
#if QT_VERSION >= 0x050000
Q_PLUGIN_METADATA(IID "org.OpenFlipper.Plugins.Plugin-")
#endif
signals:
// BaseInterface
......
......@@ -44,7 +44,13 @@
#define DECIMATERTOOLBARWIDGET_HH
#include "ui_decimaterToolbar.hh"
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
class DecimaterToolbarWidget : public QWidget, public Ui::DecimaterToolbar
{
......
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