Skip to content

Commit df8584a

Browse files
3nids3nids
committed
[qt5] fix custom widgets
1 parent b1eb812 commit df8584a

20 files changed

Lines changed: 151 additions & 20 deletions

‎src/customwidgets/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ ADD_DEFINITIONS(-DQT_NO_DEBUG)
33
ADD_DEFINITIONS(-DQT_SHARED)
44

55
IF (QT5_BUILD)
6+
FIND_PACKAGE(Qt5UiPlugin REQUIRED)
67
FIND_PACKAGE(Qt5Designer REQUIRED)
78
ENDIF (QT5_BUILD)
89

@@ -109,6 +110,7 @@ INCLUDE_DIRECTORIES(
109110
)
110111
INCLUDE_DIRECTORIES(SYSTEM
111112
${GEOS_INCLUDE_DIR}
113+
${Qt5UiPlugin_INCLUDE_DIRS} # For Qt5
112114
${Qt5Designer_INCLUDE_DIRS} # For Qt5
113115
${QT_QTDESIGNER_INCLUDE_DIR} # For Qt4
114116
)

‎src/customwidgets/qgiscustomwidgets.h‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,20 @@
1717
#define QGISCUSTOMWIDGETS_H
1818

1919

20+
#include <QtGlobal>
21+
#if QT_VERSION < 0x050000
2022
#include <QDesignerCustomWidgetCollectionInterface>
23+
#else
24+
#include <QtUiPlugin/QDesignerCustomWidgetCollectionInterface>
25+
#endif
2126
#include <qplugin.h>
2227

2328

2429
class QgisCustomWidgets : public QObject, public QDesignerCustomWidgetCollectionInterface
2530
{
2631
Q_OBJECT
2732
#if QT_VERSION >= 0x050000
28-
Q_PLUGIN_METADATA( IID "org.qgis.CustomWidgets" )
33+
Q_PLUGIN_METADATA( IID "org.qgis.customwidgets" )
2934
#endif
3035
Q_INTERFACES( QDesignerCustomWidgetCollectionInterface )
3136

‎src/customwidgets/qgscollapsiblegroupboxplugin.h‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,15 @@
1616
#ifndef QGSCOLLAPSIBLEGROUPBOXPLUGIN_H
1717
#define QGSCOLLAPSIBLEGROUPBOXPLUGIN_H
1818

19-
#include <QDesignerExportWidget>
20-
#include <QDesignerCustomWidgetInterface>
2119

20+
#include <QtGlobal>
21+
#if QT_VERSION < 0x050000
22+
#include <QDesignerCustomWidgetCollectionInterface>
23+
#include <QDesignerExportWidget>
24+
#else
25+
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
26+
#include <QtUiPlugin/QDesignerExportWidget>
27+
#endif
2228

2329
class CUSTOMWIDGETS_EXPORT QgsCollapsibleGroupBoxPlugin : public QObject, public QDesignerCustomWidgetInterface
2430
{

‎src/customwidgets/qgscolorbuttonplugin.h‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,15 @@
1616
#ifndef QGSCOLORBUTTONPLUGIN_H
1717
#define QGSCOLORBUTTONPLUGIN_H
1818

19+
20+
#include <QtGlobal>
21+
#if QT_VERSION < 0x050000
22+
#include <QDesignerCustomWidgetCollectionInterface>
1923
#include <QDesignerExportWidget>
20-
#include <QDesignerCustomWidgetInterface>
24+
#else
25+
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
26+
#include <QtUiPlugin/QDesignerExportWidget>
27+
#endif
2128

2229

2330
class CUSTOMWIDGETS_EXPORT QgsColorButtonPlugin : public QObject, public QDesignerCustomWidgetInterface

‎src/customwidgets/qgscolorbuttonv2plugin.h‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,15 @@
1616
#ifndef QGSCOLORBUTTONV2PLUGIN_H
1717
#define QGSCOLORBUTTONV2PLUGIN_H
1818

19+
20+
#include <QtGlobal>
21+
#if QT_VERSION < 0x050000
22+
#include <QDesignerCustomWidgetCollectionInterface>
1923
#include <QDesignerExportWidget>
20-
#include <QDesignerCustomWidgetInterface>
24+
#else
25+
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
26+
#include <QtUiPlugin/QDesignerExportWidget>
27+
#endif
2128

2229

2330
class CUSTOMWIDGETS_EXPORT QgsColorButtonV2Plugin : public QObject, public QDesignerCustomWidgetInterface

‎src/customwidgets/qgsdatadefinedbuttonplugin.h‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,15 @@
1616
#ifndef QGSDATADEFINEDBUTTONPLUGIN_H
1717
#define QGSDATADEFINEDBUTTONPLUGIN_H
1818

19+
20+
#include <QtGlobal>
21+
#if QT_VERSION < 0x050000
22+
#include <QDesignerCustomWidgetCollectionInterface>
1923
#include <QDesignerExportWidget>
20-
#include <QDesignerCustomWidgetInterface>
24+
#else
25+
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
26+
#include <QtUiPlugin/QDesignerExportWidget>
27+
#endif
2128

2229

2330
class CUSTOMWIDGETS_EXPORT QgsDataDefinedButtonPlugin : public QObject, public QDesignerCustomWidgetInterface

‎src/customwidgets/qgsdatetimeeditplugin.h‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,15 @@
1616
#ifndef QGSDATETIMEEDITPLUGIN_H
1717
#define QGSDATETIMEEDITPLUGIN_H
1818

19+
20+
#include <QtGlobal>
21+
#if QT_VERSION < 0x050000
22+
#include <QDesignerCustomWidgetCollectionInterface>
1923
#include <QDesignerExportWidget>
20-
#include <QDesignerCustomWidgetInterface>
24+
#else
25+
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
26+
#include <QtUiPlugin/QDesignerExportWidget>
27+
#endif
2128

2229

2330
class CUSTOMWIDGETS_EXPORT QgsDateTimeEditPlugin : public QObject, public QDesignerCustomWidgetInterface

‎src/customwidgets/qgsdoublespinboxplugin.h‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,15 @@
1616
#ifndef QGSDOUBLESPINBOXPLUGIN_H
1717
#define QGSDOUBLESPINBOXPLUGIN_H
1818

19+
20+
#include <QtGlobal>
21+
#if QT_VERSION < 0x050000
22+
#include <QDesignerCustomWidgetCollectionInterface>
1923
#include <QDesignerExportWidget>
20-
#include <QDesignerCustomWidgetInterface>
24+
#else
25+
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
26+
#include <QtUiPlugin/QDesignerExportWidget>
27+
#endif
2128

2229

2330
class CUSTOMWIDGETS_EXPORT QgsDoubleSpinBoxPlugin : public QObject, public QDesignerCustomWidgetInterface

‎src/customwidgets/qgsexpressionbuilderwidgetplugin.h‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,15 @@
1616
#ifndef QGSEXPRESSIONBUILDERWIDGETPLUGIN_H
1717
#define QGSEXPRESSIONBUILDERWIDGETPLUGIN_H
1818

19+
20+
#include <QtGlobal>
21+
#if QT_VERSION < 0x050000
22+
#include <QDesignerCustomWidgetCollectionInterface>
1923
#include <QDesignerExportWidget>
20-
#include <QDesignerCustomWidgetInterface>
24+
#else
25+
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
26+
#include <QtUiPlugin/QDesignerExportWidget>
27+
#endif
2128

2229

2330
class CUSTOMWIDGETS_EXPORT QgsExpressionBuilderWidgetPlugin : public QObject, public QDesignerCustomWidgetInterface

‎src/customwidgets/qgsextentgroupboxplugin.h‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,15 @@
1616
#ifndef QGSEXTENTGROUPBOXPLUGIN_H
1717
#define QGSEXTENTGROUPBOXPLUGIN_H
1818

19+
20+
#include <QtGlobal>
21+
#if QT_VERSION < 0x050000
22+
#include <QDesignerCustomWidgetCollectionInterface>
1923
#include <QDesignerExportWidget>
20-
#include <QDesignerCustomWidgetInterface>
24+
#else
25+
#include <QtUiPlugin/QDesignerCustomWidgetInterface>
26+
#include <QtUiPlugin/QDesignerExportWidget>
27+
#endif
2128

2229

2330
class CUSTOMWIDGETS_EXPORT QgsExtentGroupBoxPlugin : public QObject, public QDesignerCustomWidgetInterface

0 commit comments

Comments
 (0)