From 97feebaf2c535c6b930dc49f9fb15570b48d0110 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20M=C3=B6ller?= <matthias.moeller@rwth-aachen.de>
Date: Fri, 19 Jul 2013 10:58:31 +0000
Subject: [PATCH] - 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
---
 MeshRepairPlugin.cc  | 13 +++++++++++--
 MeshRepairPlugin.hh  |  4 ++++
 MeshRepairToolbar.hh |  8 +++++++-
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/MeshRepairPlugin.cc b/MeshRepairPlugin.cc
index 5f14bcb..b4d9743 100644
--- a/MeshRepairPlugin.cc
+++ b/MeshRepairPlugin.cc
@@ -40,7 +40,12 @@
  *                                                                            *
 \*===========================================================================*/
 
-#include <QtGui>
+
+#if QT_VERSION >= 0x050000 
+  #include <QtWidgets>
+#else
+  #include <QtGui>
+#endif
 
 #include "MeshRepairPlugin.hh"
 
@@ -385,4 +390,8 @@ void MeshRepairPlugin::pluginsInitialized() {
 
 }
 
-Q_EXPORT_PLUGIN2( meshrepairplugin , MeshRepairPlugin );
+#if QT_VERSION < 0x050000
+  Q_EXPORT_PLUGIN2( meshrepairplugin , MeshRepairPlugin );
+#endif
+
+
diff --git a/MeshRepairPlugin.hh b/MeshRepairPlugin.hh
index 46b4290..e78a55f 100644
--- a/MeshRepairPlugin.hh
+++ b/MeshRepairPlugin.hh
@@ -68,6 +68,10 @@ class MeshRepairPlugin : public QObject, BaseInterface , ToolboxInterface, Backu
     Q_INTERFACES(ScriptInterface)
     Q_INTERFACES(RPCInterface)
 
+#if QT_VERSION >= 0x050000
+  Q_PLUGIN_METADATA(IID "org.OpenFlipper.Plugins.Plugin-MeshRepair")
+#endif
+
 signals:
 
     void updateView();
diff --git a/MeshRepairToolbar.hh b/MeshRepairToolbar.hh
index 71eafee..56a1851 100644
--- a/MeshRepairToolbar.hh
+++ b/MeshRepairToolbar.hh
@@ -41,7 +41,13 @@
 \*===========================================================================*/
 
 #include "ui_MeshRepairControls.hh"
-#include <QtGui>
+
+#if QT_VERSION >= 0x050000 
+  #include <QtWidgets>
+#else
+  #include <QtGui>
+#endif
+
 
 class MeshRepairToolbarWidget : public QWidget, public Ui::MeshRepairControls
 {
-- 
GitLab