Commit 6fe772dd 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 ab69b39b
#include <ui_addAnimation.hh>
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
class AddAnimationDialog : public QDialog, public Ui::AddAnimation
{
......
#include <ui_animationControls.hh>
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
class AnimationToolboxWidget : public QWidget, public Ui::AnimationControls
{
......
......@@ -1059,4 +1059,8 @@ void SkeletalAnimationPlugin::setComboBoxPosition(unsigned int _animationIndex)
//------------------------------------------------------------------------------
Q_EXPORT_PLUGIN2(skeletalAnimationplugin, SkeletalAnimationPlugin);
#if QT_VERSION < 0x050000
Q_EXPORT_PLUGIN2(skeletalAnimationplugin, SkeletalAnimationPlugin);
#endif
......@@ -71,6 +71,10 @@ class SkeletalAnimationPlugin : public QObject, BaseInterface, ToolboxInterface,
Q_INTERFACES(LoadSaveInterface)
Q_INTERFACES(RPCInterface)
#if QT_VERSION >= 0x050000
Q_PLUGIN_METADATA(IID "org.OpenFlipper.Plugins.Plugin-SkeletalAnimation")
#endif
private:
/// Pose typedef
......
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