Commit f83fc637 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 72e53819
......@@ -40,7 +40,14 @@
* *
\*===========================================================================*/
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QListWidget>
class FunctionList : public QListWidget
{
......
......@@ -40,8 +40,12 @@
* *
\*===========================================================================*/
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QtGui>
#include "ScriptingPlugin.hh"
......@@ -710,5 +714,7 @@ void ScriptingPlugin::clearEditor() {
scriptWidget_->currentScript->clear();
}
Q_EXPORT_PLUGIN2( skriptingplugin , ScriptingPlugin );
#if QT_VERSION < 0x050000
Q_EXPORT_PLUGIN2( skriptingplugin , ScriptingPlugin );
#endif
......@@ -72,6 +72,10 @@ Q_INTERFACES(ScriptInterface)
Q_INTERFACES(RPCInterface)
Q_INTERFACES(LoggingInterface)
#if QT_VERSION >= 0x050000
Q_PLUGIN_METADATA(IID "org.OpenFlipper.Plugins.Plugin-Scripting")
#endif
signals:
void updateView();
......
......@@ -41,7 +41,13 @@
* *
\*===========================================================================*/
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include "codeeditor.hh"
......
......@@ -40,7 +40,12 @@
* *
\*===========================================================================*/
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include "highLighter.hh"
......
......@@ -41,7 +41,12 @@
\*===========================================================================*/
#include "ui_scriptingWidget.hh"
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
class ScriptWidget : public QMainWindow, public Ui::ScriptWidget
{
......
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