diff --git a/PropertyVisPlugin.cc b/PropertyVisPlugin.cc index 069ffa0c2de450fb97ac28d00be551f0d7980c91..cc0c0a712bd29b436d37885dfdd2a6967f364647 100644 --- a/PropertyVisPlugin.cc +++ b/PropertyVisPlugin.cc @@ -403,7 +403,4 @@ void PropertyVisPlugin::slotRemoveProperty() } } -#if QT_VERSION < 0x050000 - Q_EXPORT_PLUGIN2( propertyvisplugin , PropertyVisPlugin ); -#endif diff --git a/PropertyVisPlugin.hh b/PropertyVisPlugin.hh index e9aabed677edaf5be18845c602ee2bd1227461b1..529261c271fa7a3fe38d519e27f87eeb74d8ff6f 100644 --- a/PropertyVisPlugin.hh +++ b/PropertyVisPlugin.hh @@ -96,9 +96,7 @@ class PropertyVisPlugin : public QObject, BaseInterface, LoadSaveInterface, Tool Q_INTERFACES(PickingInterface) Q_INTERFACES(LoggingInterface) -#if QT_VERSION >= 0x050000 Q_PLUGIN_METADATA(IID "org.OpenFlipper.Plugins.Plugin-PropertyVis") -#endif signals: void updateView() override; diff --git a/PropertyVisToolbar.hh b/PropertyVisToolbar.hh index d758c99e23428979998cd6773676a02f43b9774c..d19f0df9343a70d6da30da5b39a790b5db7eb5cd 100644 --- a/PropertyVisToolbar.hh +++ b/PropertyVisToolbar.hh @@ -49,11 +49,7 @@ #include "ui_PropertyVisToolbarBase.hh" -#if QT_VERSION >= 0x050000 #include <QtWidgets> -#else - #include <QtGui> -#endif class PropertyVisToolbar : public QWidget, public Ui::PropertyVisToolbarBase diff --git a/Widgets/BooleanWidget.hh b/Widgets/BooleanWidget.hh index 4cb055babf844cb450a8236006221c9e4b61d88a..e75bc5b73ceaf066ea9f9ac6a13a2425ae7e1efa 100644 --- a/Widgets/BooleanWidget.hh +++ b/Widgets/BooleanWidget.hh @@ -52,11 +52,7 @@ #include "ui_BooleanWidget.hh" -#if QT_VERSION >= 0x050000 #include <QtWidgets> -#else - #include <QtGui> -#endif class BooleanWidget : public QWidget, public Ui::BooleanWidget diff --git a/Widgets/DoubleWidget.hh b/Widgets/DoubleWidget.hh index b947ade8927c3b6b06f65a98dc0b91df74a9d015..8793e91170e206dd1feed6612cd74fee3b5631f6 100644 --- a/Widgets/DoubleWidget.hh +++ b/Widgets/DoubleWidget.hh @@ -57,11 +57,7 @@ #include <ACG/Utils/ColorConversion.hh> #include <ACG/Utils/SmartPointer.hh> -#if QT_VERSION >= 0x050000 #include <QtWidgets> -#else - #include <QtGui> -#endif class DoubleWidget : public QWidget, public Ui::DoubleWidget diff --git a/Widgets/IntegerWidget.hh b/Widgets/IntegerWidget.hh index c916d168bbe1ce2af831d1540ac9492f3131615f..ce926d7e582b028cc6447452ca89fb9dc486eac1 100644 --- a/Widgets/IntegerWidget.hh +++ b/Widgets/IntegerWidget.hh @@ -58,11 +58,7 @@ #include <ACG/Utils/ColorConversion.hh> #include <ACG/Utils/SmartPointer.hh> -#if QT_VERSION >= 0x050000 #include <QtWidgets> -#else - #include <QtGui> -#endif class IntegerWidget : public QWidget, public Ui::IntegerWidget diff --git a/Widgets/LoadSaveWidget.hh b/Widgets/LoadSaveWidget.hh index 8cc231486906dffa93e442938500d69be2916af5..e34ffad36bafc6924556d1a46b7b1dc4e5a20535 100644 --- a/Widgets/LoadSaveWidget.hh +++ b/Widgets/LoadSaveWidget.hh @@ -52,11 +52,7 @@ #include "ui_LoadSaveWidget.hh" -#if QT_VERSION >= 0x050000 #include <QtWidgets> -#else - #include <QtGui> -#endif class LoadSaveWidget : public QWidget, public Ui::LoadSaveWidget diff --git a/Widgets/PickWidget.hh b/Widgets/PickWidget.hh index 7bf5c68e5c61155ab633119a1512ec82e941f549..515e54895e4254e5b777d4cc81d57706ed74141f 100644 --- a/Widgets/PickWidget.hh +++ b/Widgets/PickWidget.hh @@ -52,11 +52,7 @@ #include "ui_PickWidget.hh" -#if QT_VERSION >= 0x050000 #include <QtWidgets> -#else - #include <QtGui> -#endif class PickWidget : public QWidget, public Ui::PickWidget diff --git a/Widgets/SkinWeightsWidget.hh b/Widgets/SkinWeightsWidget.hh index 2afcd03022162b864f5c122f6c1251686862d6d6..29398c675289adc648bbbc0f9f8f89266ac58b21 100644 --- a/Widgets/SkinWeightsWidget.hh +++ b/Widgets/SkinWeightsWidget.hh @@ -52,11 +52,7 @@ #include "ui_SkinWeightsWidget.hh" -#if QT_VERSION >= 0x050000 #include <QtWidgets> -#else - #include <QtGui> -#endif class SkinWeightsWidget : public QWidget, public Ui::SkinWeightsWidget diff --git a/Widgets/VectorFieldDifferenceWidget.hh b/Widgets/VectorFieldDifferenceWidget.hh index 6dff5b2a8185058c4d797e69535396b17f0fea55..7efafa437c2943525058073fc834355a6b5a21a4 100644 --- a/Widgets/VectorFieldDifferenceWidget.hh +++ b/Widgets/VectorFieldDifferenceWidget.hh @@ -52,11 +52,7 @@ #include "ui_VectorFieldDifferenceWidget.hh" -#if QT_VERSION >= 0x050000 #include <QtWidgets> -#else - #include <QtGui> -#endif class VectorFieldDifferenceWidget : public QWidget, public Ui::VectorFieldDifferenceWidget diff --git a/Widgets/VectorWidget.hh b/Widgets/VectorWidget.hh index 5e888b9b75449b594441bceaf75c4531e5c0003a..2a9668d15cca0898b04468aa65dbeefad9c8b4a0 100644 --- a/Widgets/VectorWidget.hh +++ b/Widgets/VectorWidget.hh @@ -52,11 +52,7 @@ #include "ui_VectorWidget.hh" -#if QT_VERSION >= 0x050000 #include <QtWidgets> -#else - #include <QtGui> -#endif class VectorWidget : public QWidget, public Ui::VectorWidget