Skip to content

Commit b3e8d82

Browse files
3nids3nids
committed
remove QT_VERSION test in custom widgets
1 parent f7dbc05 commit b3e8d82

22 files changed

+2
-110
lines changed

‎src/customwidgets/qgiscustomwidgets.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,7 @@ QList<QDesignerCustomWidgetInterface*> QgisCustomWidgets::customWidgets() const
6464
return mWidgets;
6565
}
6666

67-
#if QT_VERSION < 0x050000
6867
Q_EXPORT_PLUGIN2( customwidgetsplugin, QgisCustomWidgets )
69-
#endif
68+
7069

7170

‎src/customwidgets/qgiscustomwidgets.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,14 @@
1818

1919

2020
#include <QtGlobal>
21-
#if QT_VERSION < 0x050000
22-
#include <QDesignerCustomWidgetCollectionInterface>
23-
#else
2421
#include <QtUiPlugin/QDesignerCustomWidgetCollectionInterface>
25-
#endif
2622
#include <qplugin.h>
2723

2824

2925
class QgisCustomWidgets : public QObject, public QDesignerCustomWidgetCollectionInterface
3026
{
3127
Q_OBJECT
32-
#if QT_VERSION >= 0x050000
3328
Q_PLUGIN_METADATA( IID "org.qgis.customwidgets" )
34-
#endif
3529
Q_INTERFACES( QDesignerCustomWidgetCollectionInterface )
3630

3731
public:

‎src/customwidgets/qgscollapsiblegroupboxplugin.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,9 @@
1818

1919

2020
#include <QtGlobal>
21-
#if QT_VERSION < 0x050000
22-
#include <QDesignerCustomWidgetCollectionInterface>
23-
#include <QDesignerExportWidget>
24-
#else
2521
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
2622
#include <QtUiPlugin/QDesignerExportWidget>
2723
#include "qgis_customwidgets.h"
28-
#endif
2924

3025
class CUSTOMWIDGETS_EXPORT QgsCollapsibleGroupBoxPlugin : public QObject, public QDesignerCustomWidgetInterface
3126
{

‎src/customwidgets/qgscolorbuttonplugin.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,9 @@
1818

1919

2020
#include <QtGlobal>
21-
#if QT_VERSION < 0x050000
22-
#include <QDesignerCustomWidgetCollectionInterface>
23-
#include <QDesignerExportWidget>
24-
#else
2521
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
2622
#include <QtUiPlugin/QDesignerExportWidget>
2723
#include "qgis_customwidgets.h"
28-
#endif
2924

3025

3126
class CUSTOMWIDGETS_EXPORT QgsColorButtonPlugin : public QObject, public QDesignerCustomWidgetInterface

‎src/customwidgets/qgsdatadefinedbuttonplugin.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,9 @@
1818

1919

2020
#include <QtGlobal>
21-
#if QT_VERSION < 0x050000
22-
#include <QDesignerCustomWidgetCollectionInterface>
23-
#include <QDesignerExportWidget>
24-
#else
2521
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
2622
#include <QtUiPlugin/QDesignerExportWidget>
2723
#include "qgis_customwidgets.h"
28-
#endif
2924

3025

3126
class CUSTOMWIDGETS_EXPORT QgsDataDefinedButtonPlugin : public QObject, public QDesignerCustomWidgetInterface

‎src/customwidgets/qgsdatetimeeditplugin.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,9 @@
1818

1919

2020
#include <QtGlobal>
21-
#if QT_VERSION < 0x050000
22-
#include <QDesignerCustomWidgetCollectionInterface>
23-
#include <QDesignerExportWidget>
24-
#else
2521
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
2622
#include <QtUiPlugin/QDesignerExportWidget>
2723
#include "qgis_customwidgets.h"
28-
#endif
2924

3025

3126
class CUSTOMWIDGETS_EXPORT QgsDateTimeEditPlugin : public QObject, public QDesignerCustomWidgetInterface

‎src/customwidgets/qgsdockwidgetplugin.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,9 @@
1818

1919

2020
#include <QtGlobal>
21-
#if QT_VERSION < 0x050000
22-
#include <QDesignerCustomWidgetCollectionInterface>
23-
#include <QDesignerExportWidget>
24-
#else
2521
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
2622
#include <QtUiPlugin/QDesignerExportWidget>
2723
#include "qgis_customwidgets.h"
28-
#endif
2924

3025
class CUSTOMWIDGETS_EXPORT QgsDockWidgetPlugin : public QObject, public QDesignerCustomWidgetInterface
3126
{

‎src/customwidgets/qgsdoublespinboxplugin.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,9 @@
1818

1919

2020
#include <QtGlobal>
21-
#if QT_VERSION < 0x050000
22-
#include <QDesignerCustomWidgetCollectionInterface>
23-
#include <QDesignerExportWidget>
24-
#else
2521
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
2622
#include <QtUiPlugin/QDesignerExportWidget>
2723
#include "qgis_customwidgets.h"
28-
#endif
2924

3025

3126
class CUSTOMWIDGETS_EXPORT QgsDoubleSpinBoxPlugin : public QObject, public QDesignerCustomWidgetInterface

‎src/customwidgets/qgsexpressionbuilderwidgetplugin.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,9 @@
1818

1919

2020
#include <QtGlobal>
21-
#if QT_VERSION < 0x050000
22-
#include <QDesignerCustomWidgetCollectionInterface>
23-
#include <QDesignerExportWidget>
24-
#else
2521
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
2622
#include <QtUiPlugin/QDesignerExportWidget>
2723
#include "qgis_customwidgets.h"
28-
#endif
2924

3025

3126
class CUSTOMWIDGETS_EXPORT QgsExpressionBuilderWidgetPlugin : public QObject, public QDesignerCustomWidgetInterface

‎src/customwidgets/qgsextentgroupboxplugin.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,9 @@
1818

1919

2020
#include <QtGlobal>
21-
#if QT_VERSION < 0x050000
22-
#include <QDesignerCustomWidgetCollectionInterface>
23-
#include <QDesignerExportWidget>
24-
#else
2521
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
2622
#include <QtUiPlugin/QDesignerExportWidget>
2723
#include "qgis_customwidgets.h"
28-
#endif
2924

3025

3126
class CUSTOMWIDGETS_EXPORT QgsExtentGroupBoxPlugin : public QObject, public QDesignerCustomWidgetInterface

‎src/customwidgets/qgsexternalresourcewidgetplugin.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,9 @@
1818

1919

2020
#include <QtGlobal>
21-
#if QT_VERSION < 0x050000
22-
#include <QDesignerCustomWidgetCollectionInterface>
23-
#include <QDesignerExportWidget>
24-
#else
2521
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
2622
#include <QtUiPlugin/QDesignerExportWidget>
2723
#include "qgis_customwidgets.h"
28-
#endif
2924

3025

3126
class CUSTOMWIDGETS_EXPORT QgsExternalResourceWidgetPlugin : public QObject, public QDesignerCustomWidgetInterface

‎src/customwidgets/qgsfieldcomboboxplugin.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,9 @@
1818

1919

2020
#include <QtGlobal>
21-
#if QT_VERSION < 0x050000
22-
#include <QDesignerCustomWidgetCollectionInterface>
23-
#include <QDesignerExportWidget>
24-
#else
2521
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
2622
#include <QtUiPlugin/QDesignerExportWidget>
2723
#include "qgis_customwidgets.h"
28-
#endif
2924

3025

3126
class CUSTOMWIDGETS_EXPORT QgsFieldComboBoxPlugin : public QObject, public QDesignerCustomWidgetInterface

‎src/customwidgets/qgsfieldexpressionwidgetplugin.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,9 @@
1818

1919

2020
#include <QtGlobal>
21-
#if QT_VERSION < 0x050000
22-
#include <QDesignerCustomWidgetCollectionInterface>
23-
#include <QDesignerExportWidget>
24-
#else
2521
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
2622
#include <QtUiPlugin/QDesignerExportWidget>
2723
#include "qgis_customwidgets.h"
28-
#endif
2924

3025

3126
class CUSTOMWIDGETS_EXPORT QgsFieldExpressionWidgetPlugin : public QObject, public QDesignerCustomWidgetInterface

‎src/customwidgets/qgsfilewidgetplugin.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,10 @@
1818

1919

2020
#include <QtGlobal>
21-
#if QT_VERSION < 0x050000
22-
#include <QDesignerCustomWidgetCollectionInterface>
23-
#include <QDesignerExportWidget>
24-
#else
2521
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
2622
#include <QtUiPlugin/QDesignerExportWidget>
2723
#include "qgis_customwidgets.h"
28-
#endif
24+
2925

3026

3127
class CUSTOMWIDGETS_EXPORT QgsFileWidgetPlugin : public QObject, public QDesignerCustomWidgetInterface

‎src/customwidgets/qgsfilterlineeditplugin.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,9 @@
1818

1919

2020
#include <QtGlobal>
21-
#if QT_VERSION < 0x050000
22-
#include <QDesignerCustomWidgetCollectionInterface>
23-
#include <QDesignerExportWidget>
24-
#else
2521
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
2622
#include <QtUiPlugin/QDesignerExportWidget>
2723
#include "qgis_customwidgets.h"
28-
#endif
2924

3025

3126
class CUSTOMWIDGETS_EXPORT QgsFilterLineEditPlugin : public QObject, public QDesignerCustomWidgetInterface

‎src/customwidgets/qgsmaplayercomboboxplugin.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,9 @@
1818

1919

2020
#include <QtGlobal>
21-
#if QT_VERSION < 0x050000
22-
#include <QDesignerCustomWidgetCollectionInterface>
23-
#include <QDesignerExportWidget>
24-
#else
2521
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
2622
#include <QtUiPlugin/QDesignerExportWidget>
2723
#include "qgis_customwidgets.h"
28-
#endif
2924

3025

3126
class CUSTOMWIDGETS_EXPORT QgsMapLayerComboBoxPlugin : public QObject, public QDesignerCustomWidgetInterface

‎src/customwidgets/qgsprojectionselectionwidgetplugin.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,9 @@
1818

1919

2020
#include <QtGlobal>
21-
#if QT_VERSION < 0x050000
22-
#include <QDesignerCustomWidgetCollectionInterface>
23-
#include <QDesignerExportWidget>
24-
#else
2521
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
2622
#include <QtUiPlugin/QDesignerExportWidget>
2723
#include "qgis_customwidgets.h"
28-
#endif
29-
3024

3125
class CUSTOMWIDGETS_EXPORT QgsProjectionSelectionWidgetPlugin : public QObject, public QDesignerCustomWidgetInterface
3226
{

‎src/customwidgets/qgsrelationeditorwidgetplugin.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,9 @@
1818

1919

2020
#include <QtGlobal>
21-
#if QT_VERSION < 0x050000
22-
#include <QDesignerCustomWidgetCollectionInterface>
23-
#include <QDesignerExportWidget>
24-
#else
2521
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
2622
#include <QtUiPlugin/QDesignerExportWidget>
2723
#include "qgis_customwidgets.h"
28-
#endif
29-
3024

3125
class CUSTOMWIDGETS_EXPORT QgsRelationEditorWidgetPlugin : public QObject, public QDesignerCustomWidgetInterface
3226
{

‎src/customwidgets/qgsrelationreferencewidgetplugin.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,9 @@
1818

1919

2020
#include <QtGlobal>
21-
#if QT_VERSION < 0x050000
22-
#include <QDesignerCustomWidgetCollectionInterface>
23-
#include <QDesignerExportWidget>
24-
#else
2521
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
2622
#include <QtUiPlugin/QDesignerExportWidget>
2723
#include "qgis_customwidgets.h"
28-
#endif
2924

3025

3126
class CUSTOMWIDGETS_EXPORT QgsRelationReferenceWidgetPlugin : public QObject, public QDesignerCustomWidgetInterface

‎src/customwidgets/qgsscalerangewidgetplugin.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,9 @@
1818

1919

2020
#include <QtGlobal>
21-
#if QT_VERSION < 0x050000
22-
#include <QDesignerCustomWidgetCollectionInterface>
23-
#include <QDesignerExportWidget>
24-
#else
2521
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
2622
#include <QtUiPlugin/QDesignerExportWidget>
2723
#include "qgis_customwidgets.h"
28-
#endif
2924

3025

3126
class CUSTOMWIDGETS_EXPORT QgsScaleRangeWidgetPlugin : public QObject, public QDesignerCustomWidgetInterface

‎src/customwidgets/qgsscalewidgetplugin.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,9 @@
1818

1919

2020
#include <QtGlobal>
21-
#if QT_VERSION < 0x050000
22-
#include <QDesignerCustomWidgetCollectionInterface>
23-
#include <QDesignerExportWidget>
24-
#else
2521
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
2622
#include <QtUiPlugin/QDesignerExportWidget>
2723
#include "qgis_customwidgets.h"
28-
#endif
2924

3025

3126
class CUSTOMWIDGETS_EXPORT QgsScaleWidgetPlugin : public QObject, public QDesignerCustomWidgetInterface

‎src/customwidgets/qgsspinboxplugin.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,9 @@
1717
#define QGSSPINBOXPLUGIN_H
1818

1919
#include <QtGlobal>
20-
#if QT_VERSION < 0x050000
21-
#include <QDesignerCustomWidgetCollectionInterface>
22-
#include <QDesignerExportWidget>
23-
#else
2420
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
2521
#include <QtUiPlugin/QDesignerExportWidget>
2622
#include "qgis_customwidgets.h"
27-
#endif
2823

2924

3025
class CUSTOMWIDGETS_EXPORT QgsSpinBoxPlugin : public QObject, public QDesignerCustomWidgetInterface

0 commit comments

Comments
 (0)