Commit 64f9fae3 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 06772543
......@@ -60,7 +60,12 @@
//== INCLUDES =================================================================
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <qwt_plot.h>
#include <qwt_plot_curve.h>
#include <qwt_plot_zoomer.h>
......
......@@ -41,11 +41,13 @@
\*===========================================================================*/
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QtGui>
#include "TextureControl.hh"
#include <iostream>
......@@ -2054,5 +2056,7 @@ void TextureControlPlugin::slotRestored( int _objectid ) {
slotSwitchTexture(currentTexture,_objectid);
}
Q_EXPORT_PLUGIN2( texturecontrolplugin , TextureControlPlugin );
#if QT_VERSION < 0x050000
Q_EXPORT_PLUGIN2( texturecontrolplugin , TextureControlPlugin );
#endif
......@@ -84,6 +84,10 @@ class TextureControlPlugin : public QObject, BaseInterface, BackupInterface, Tex
Q_INTERFACES(ContextMenuInterface)
Q_INTERFACES(BackupInterface)
#if QT_VERSION >= 0x050000
Q_PLUGIN_METADATA(IID "org.OpenFlipper.Plugins.Plugin-TextureControl")
#endif
public:
signals:
......
......@@ -45,7 +45,12 @@
#include "ui_textureProperties.hh"
#include "TextureData.hh"
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#ifdef WITH_QWT
#include "QwtFunctionPlot.hh"
......
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