Commit 64047555 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 1af69626
......@@ -41,7 +41,13 @@
\*===========================================================================*/
#include "ui_rulerOptions.hh"
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
class RulerOptions : public QWidget, public Ui::rulerOptions
{
......
......@@ -277,4 +277,7 @@ void RulerPlugin::applyOptions()
OpenFlipperSettings().setValue(textSizeSettingName_,textSize);
}
Q_EXPORT_PLUGIN2( rulerPlugin , RulerPlugin );
#if QT_VERSION < 0x050000
Q_EXPORT_PLUGIN2( rulerPlugin , RulerPlugin );
#endif
......@@ -72,6 +72,10 @@ class RulerPlugin : public QObject, BaseInterface, MouseInterface, PickingInterf
Q_INTERFACES(LoadSaveInterface)
Q_INTERFACES(OptionsInterface)
#if QT_VERSION >= 0x050000
Q_PLUGIN_METADATA(IID "org.OpenFlipper.Plugins.Plugin-Ruler")
#endif
signals:
void addToolbar(QToolBar *_toolbar);
......
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