Removed check for Qt less than 5

674a6a61 · Jan Möbius · 6cf58d2c · 674a6a61 · 674a6a61 · 674a6a61
Commit 674a6a61 authored Apr 16, 2018 by Jan Möbius
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 13 deletions

ColorOptions.hh ColorOptions.hh +0 -4

ColorPlugin.cc ColorPlugin.cc +0 -7

ColorPlugin.hh ColorPlugin.hh +0 -2

No files found.
--- a/ColorOptions.hh
+++ b/ColorOptions.hh
@@ -49,11 +49,7 @@

 #include "ui_colorOptions.hh"

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


 class ColorOptions : public QWidget, public Ui::colorOptions

--- a/ColorPlugin.cc
+++ b/ColorPlugin.cc
@@ -49,10 +49,6 @@

 #include "ColorPlugin.hh"

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

 #include <OpenFlipper/BasePlugin/PluginFunctions.hh>
 #include <OpenFlipper/common/GlobalOptions.hh>
@@ -640,8 +636,5 @@ std::cerr << "save to ini file\n";
  _ini.add_entry("ColorPlugin","lineWidthPresentation", lineWidthPresentation_ );
 }

-#if QT_VERSION < 0x050000
-Q_EXPORT_PLUGIN2( colorplugin , ColorPlugin );
-#endif


--- a/ColorPlugin.hh
+++ b/ColorPlugin.hh
@@ -80,9 +80,7 @@ class ColorPlugin : public QObject, BaseInterface, MenuInterface, ScriptInterfac
  Q_INTERFACES(OptionsInterface)
  Q_INTERFACES(INIInterface)

-#if QT_VERSION >= 0x050000
  Q_PLUGIN_METADATA(IID "org.OpenFlipper.Plugins.Plugin-Color")
-#endif

  signals:
    // BaseInterface