Removed check for Qt less than 5

cb5d7a1c · Jan Möbius · e040e48d · cb5d7a1c · cb5d7a1c · cb5d7a1c
Commit cb5d7a1c authored Apr 16, 2018 by Jan Möbius
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 13 deletions

ViewControlPlugin.cc ViewControlPlugin.cc +0 -7

ViewControlPlugin.hh ViewControlPlugin.hh +0 -2

shaderWidget.hh shaderWidget.hh +0 -4

No files found.
--- a/ViewControlPlugin.cc
+++ b/ViewControlPlugin.cc
@@ -54,10 +54,6 @@
 #include <OpenFlipper/ACGHelper/DrawModeConverter.hh>
 #include <ACG/Scenegraph/CoordsysNode.hh>

-#if QT_VERSION >= 0x050000
-#else
-#include <QtGui>
-#endif

 #define SHOW_SELECTION    "Selections"
 #define SHOW_AREAS        "Modeling Areas"
@@ -1545,7 +1541,4 @@ void ViewControlPlugin::setDescriptions() {
 }


-#if QT_VERSION < 0x050000
-  Q_EXPORT_PLUGIN2( viewcontrolplugin , ViewControlPlugin );
-#endif

--- a/ViewControlPlugin.hh
+++ b/ViewControlPlugin.hh
@@ -96,9 +96,7 @@ 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

--- a/shaderWidget.hh
+++ b/shaderWidget.hh
@@ -49,11 +49,7 @@

 #include "ui_shaderWidget.hh"

-#if QT_VERSION >= 0x050000 
  #include <QtWidgets>
-#else
-  #include <QtGui>
-#endif


 class ShaderWidget : public QWidget, public Ui::ShaderSettings