diff options
| author | Mateusz Skowroński <skowri@gmail.com> | 2016-01-31 00:11:26 +0100 |
|---|---|---|
| committer | Mateusz Skowroński <skowri@gmail.com> | 2016-01-31 07:50:04 +0100 |
| commit | fa8af4bfbcc6631c744a9b4ae02093dabe60f5c7 (patch) | |
| tree | 6b8953c7839d865444372023d4e73ec0eb1ccff7 /plugins | |
| parent | c84714f85e5b84de4e6c29f6cbb26ac6d047ccb5 (diff) | |
Header <QtDesigner/QDesignerCustomWidgetInterface> is deprecated in Qt5.5.
Use <QtUiPlugin/QDesignerCustomWidgetInterface> instead.
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/customwidget.cpp | 1 | ||||
| -rw-r--r-- | plugins/customwidget.h | 13 | ||||
| -rw-r--r-- | plugins/customwidgets.cpp | 1 | ||||
| -rw-r--r-- | plugins/customwidgets.h | 16 |
4 files changed, 12 insertions, 19 deletions
diff --git a/plugins/customwidget.cpp b/plugins/customwidget.cpp index c422f568e..58b6f70f6 100644 --- a/plugins/customwidget.cpp +++ b/plugins/customwidget.cpp @@ -23,7 +23,6 @@ #include "customwidget.h" -#include <shiboken.h> struct PyCustomWidgetPrivate { diff --git a/plugins/customwidget.h b/plugins/customwidget.h index 323ec5a0f..bba521859 100644 --- a/plugins/customwidget.h +++ b/plugins/customwidget.h @@ -24,16 +24,15 @@ #define _PY_CUSTOM_WIDGET_H_ #include <shiboken.h> -#include <QtDesigner/QtDesigner> -#include <QDesignerCustomWidgetInterface> -// Qt5: no idea why this definition is not found automatically! It should come -// from <QDesignerCustomWidgetInterface> which resolves to Qt5's customwidget.h -#ifdef Q_MOC_RUN -Q_DECLARE_INTERFACE(QDesignerCustomWidgetInterface, - "org.qt-project.Qt.QDesignerCustomWidgetInterface") +#include <QtCore/QtGlobal> +#if (QT_VERSION < QT_VERSION_CHECK(5, 5, 0)) + #include <QtDesigner/QDesignerCustomWidgetInterface> +#else + #include <QtUiPlugin/QDesignerCustomWidgetInterface> #endif + struct PyCustomWidgetPrivate; class PyCustomWidget: public QObject, public QDesignerCustomWidgetInterface diff --git a/plugins/customwidgets.cpp b/plugins/customwidgets.cpp index c1537adae..8ff80df3a 100644 --- a/plugins/customwidgets.cpp +++ b/plugins/customwidgets.cpp @@ -23,7 +23,6 @@ #include "customwidget.h" #include "customwidgets.h" -#include <shiboken.h> struct PyCustomWidgetPrivate { diff --git a/plugins/customwidgets.h b/plugins/customwidgets.h index 881e21fa8..dcd62a2e9 100644 --- a/plugins/customwidgets.h +++ b/plugins/customwidgets.h @@ -24,19 +24,15 @@ #define _PY_CUSTOM_WIDGETS_H_ #include <shiboken.h> -#include <customwidget.h> -#include <QtDesigner/QtDesigner> -#include <QtPlugin> -#include <QDesignerCustomWidgetInterface> - -// Qt5: no idea why this definition is not found automatically! It should come -// from <QDesignerCustomWidgetInterface> which resolves to Qt5's customwidget.h -#ifdef Q_MOC_RUN -Q_DECLARE_INTERFACE(QDesignerCustomWidgetCollectionInterface, - "org.qt-project.Qt.QDesignerCustomWidgetCollectionInterface") +#include <QtCore/QtGlobal> +#if (QT_VERSION < QT_VERSION_CHECK(5, 5, 0)) + #include <QtDesigner/QDesignerCustomWidgetInterface> +#else + #include <QtUiPlugin/QDesignerCustomWidgetInterface> #endif + struct PyCustomWidgetsPrivate; class PyCustomWidgets: public QObject, public QDesignerCustomWidgetCollectionInterface |