Commit e3654b8c 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 f43adb32
......@@ -40,11 +40,11 @@
* *
\*===========================================================================*/
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include "DataControlPlugin.hh"
......@@ -871,5 +871,7 @@ void DataControlPlugin::showReducedUi(bool reduced) {
tool_->visibleDataBtn->setVisible(!reduced);
}
#if QT_VERSION < 0x050000
Q_EXPORT_PLUGIN2( datacontrolplugin , DataControlPlugin );
#endif
......@@ -77,6 +77,10 @@ class DataControlPlugin : public QObject, BaseInterface, ToolboxInterface, KeyIn
Q_INTERFACES(ScriptInterface)
Q_INTERFACES(LoadSaveInterface)
#if QT_VERSION >= 0x050000
Q_PLUGIN_METADATA(IID "org.OpenFlipper.Plugins.Plugin-DataControl")
#endif
signals:
// BaseInterface
void updateView();
......
......@@ -41,7 +41,13 @@
\*===========================================================================*/
#include "ui_toolbox.hh"
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
class DatacontrolToolboxWidget : public QWidget, public Ui::dctoolbox
{
......
......@@ -41,7 +41,13 @@
\*===========================================================================*/
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QBrush>
#include "TreeModel.hh"
......
......@@ -41,7 +41,12 @@
\*===========================================================================*/
#include <QTreeView>
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
class DataControlTreeView : public QTreeView
{
......
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