Removed check for Qt less than 5

4350ba1c · Jan Möbius · 91484374 · 4350ba1c · 4350ba1c
Commit 4350ba1c authored Apr 16, 2018 by Jan Möbius
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 9 deletions

FileOBJ.cc FileOBJ.cc +0 -7

FileOBJ.hh FileOBJ.hh +0 -2

No files found.
--- a/FileOBJ.cc
+++ b/FileOBJ.cc
@@ -55,11 +55,7 @@

 #include <OpenFlipper/Utils/Memory/RAMInfo.hh>

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

 #include "FileOBJ.hh"

@@ -2374,8 +2370,5 @@ void FileOBJPlugin::slotSaveDefault() {

 }

-#if QT_VERSION < 0x050000
-  Q_EXPORT_PLUGIN2( fileobjplugin , FileOBJPlugin );
-#endif


--- a/FileOBJ.hh
+++ b/FileOBJ.hh
@@ -98,9 +98,7 @@ class FileOBJPlugin : public QObject, BaseInterface, FileInterface, LoadSaveInte
   Q_INTERFACES(StatusbarInterface)
   Q_INTERFACES(RPCInterface)
   Q_INTERFACES(TextureInterface)
-#if QT_VERSION >= 0x050000
  Q_PLUGIN_METADATA(IID "org.OpenFlipper.Plugins.Plugin-FileOBJ")
-#endif
  signals:
    void openedFile( int _id );
    void addEmptyObject( DataType _type, int& _id);