Commit c449b828 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 c27b478e
......@@ -40,7 +40,13 @@
* *
\*===========================================================================*/
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include "ViewControlPlugin.hh"
#include <iostream>
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
......@@ -1478,5 +1484,7 @@ void ViewControlPlugin::setDescriptions() {
}
Q_EXPORT_PLUGIN2( viewcontrolplugin , ViewControlPlugin );
#if QT_VERSION < 0x050000
Q_EXPORT_PLUGIN2( viewcontrolplugin , ViewControlPlugin );
#endif
......@@ -89,6 +89,10 @@ class ViewControlPlugin : public QObject, BaseInterface , PickingInterface, Logg
Q_INTERFACES(ToolbarInterface)
Q_INTERFACES(ContextMenuInterface)
#if QT_VERSION >= 0x050000
Q_PLUGIN_METADATA(IID "org.OpenFlipper.Plugins.Plugin-ViewControl")
#endif
signals:
//BaseInterface
void updateView();
......
......@@ -41,7 +41,13 @@
\*===========================================================================*/
#include "ui_shaderWidget.hh"
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
class ShaderWidget : public QWidget, public Ui::ShaderSettings
{
......
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