Commit d3403976 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 c14699ec
...@@ -41,7 +41,13 @@ ...@@ -41,7 +41,13 @@
\*===========================================================================*/ \*===========================================================================*/
#include "ui_colorOptions.hh" #include "ui_colorOptions.hh"
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
class ColorOptions : public QWidget, public Ui::colorOptions class ColorOptions : public QWidget, public Ui::colorOptions
{ {
......
...@@ -40,7 +40,12 @@ ...@@ -40,7 +40,12 @@
* * * *
\*===========================================================================*/ \*===========================================================================*/
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include "ColorPlugin.hh" #include "ColorPlugin.hh"
...@@ -633,6 +638,8 @@ std::cerr << "save to ini file\n"; ...@@ -633,6 +638,8 @@ std::cerr << "save to ini file\n";
_ini.add_entry("ColorPlugin","lineWidthPresentation", lineWidthPresentation_ ); _ini.add_entry("ColorPlugin","lineWidthPresentation", lineWidthPresentation_ );
} }
#if QT_VERSION < 0x050000
Q_EXPORT_PLUGIN2( colorplugin , ColorPlugin ); Q_EXPORT_PLUGIN2( colorplugin , ColorPlugin );
#endif
...@@ -73,6 +73,10 @@ class ColorPlugin : public QObject, BaseInterface, MenuInterface, ScriptInterfac ...@@ -73,6 +73,10 @@ class ColorPlugin : public QObject, BaseInterface, MenuInterface, ScriptInterfac
Q_INTERFACES(OptionsInterface) Q_INTERFACES(OptionsInterface)
Q_INTERFACES(INIInterface) Q_INTERFACES(INIInterface)
#if QT_VERSION >= 0x050000
Q_PLUGIN_METADATA(IID "org.OpenFlipper.Plugins.Plugin-Color")
#endif
signals: signals:
// BaseInterface // BaseInterface
void updateView(); void updateView();
......
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