Bladeren bron

COMP: designer plugin: Fix deprecated use of headers in Qt5

/path/to/Qt5.5.1/5.5/gcc_64/include/QtDesigner/QDesignerCustomWidgetInterface:4:4: warning: #warning Header <QtDesigner/QDesignerCustomWidgetInterface> is deprecated. Please include <QtUiPlugin/QDesignerCustomWidgetInterface> instead. [-Wcpp]
 #  warning Header <QtDesigner/QDesignerCustomWidgetInterface> is deprecated. Please include <QtUiPlugin/QDesignerCustomWidgetInterface> instead.
    ^
Jean-Christophe Fillion-Robin 8 jaren geleden
bovenliggende
commit
d528a58849

+ 5 - 0
Libs/DICOM/Widgets/Plugins/ctkDICOMWidgetsAbstractPlugin.h

@@ -22,7 +22,12 @@
 #define __ctkDICOMWidgetsAbstractPlugin_h
 
 // Qt includes
+#include <QtGlobal>
+#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
 #include <QDesignerCustomWidgetInterface>
+#else
+#include <QtUiPlugin/QDesignerCustomWidgetInterface>
+#endif
 
 // CTK includes
 #include "ctkDICOMWidgetsPluginsExport.h"

+ 5 - 0
Libs/DICOM/Widgets/Plugins/ctkDICOMWidgetsPlugins.h

@@ -22,7 +22,12 @@
 #define __ctkDICOMWidgetsPlugins_h
 
 // Qt includes
+#include <QtGlobal>
+#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
 #include <QDesignerCustomWidgetCollectionInterface>
+#else
+#include <QtUiPlugin/QDesignerCustomWidgetCollectionInterface>
+#endif
 
 // CTK includes
 #include "ctkDICOMWidgetsPluginsExport.h"

+ 5 - 0
Libs/Scripting/Python/Widgets/Plugins/ctkScriptingPythonWidgetsAbstractPlugin.h

@@ -22,7 +22,12 @@
 #define __ctkScriptingPythonWidgetsAbstractPlugin_h
 
 // Qt includes
+#include <QtGlobal>
+#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
 #include <QDesignerCustomWidgetInterface>
+#else
+#include <QtUiPlugin/QDesignerCustomWidgetInterface>
+#endif
 
 // CTK includes
 #include "ctkScriptingPythonWidgetsPluginsExport.h"

+ 5 - 0
Libs/Scripting/Python/Widgets/Plugins/ctkScriptingPythonWidgetsPlugins.h

@@ -22,7 +22,12 @@
 #define __ctkScriptingPythonWidgetsPlugins_h
 
 // Qt includes
+#include <QtGlobal>
+#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
 #include <QDesignerCustomWidgetCollectionInterface>
+#else
+#include <QtUiPlugin/QDesignerCustomWidgetCollectionInterface>
+#endif
 
 // CTK includes
 #include "ctkScriptingPythonWidgetsPluginsExport.h"

+ 5 - 0
Libs/Visualization/VTK/Widgets/Plugins/ctkVTKWidgetsAbstractPlugin.h

@@ -22,7 +22,12 @@
 #define __ctkVTKWidgetsAbstractPlugin_h
 
 // Qt includes
+#include <QtGlobal>
+#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
 #include <QDesignerCustomWidgetInterface>
+#else
+#include <QtUiPlugin/QDesignerCustomWidgetInterface>
+#endif
 
 // CTK includes
 #include "ctkVisualizationVTKWidgetsPluginsExport.h"

+ 5 - 0
Libs/Visualization/VTK/Widgets/Plugins/ctkVTKWidgetsPlugins.h

@@ -22,7 +22,12 @@
 #define __ctkVTKWidgetsPlugins_h
 
 // Qt includes
+#include <QtGlobal>
+#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
 #include <QDesignerCustomWidgetCollectionInterface>
+#else
+#include <QtUiPlugin/QDesignerCustomWidgetCollectionInterface>
+#endif
 
 // CTK includes
 #include "ctkVisualizationVTKWidgetsPluginsExport.h"

+ 5 - 0
Libs/Widgets/Plugins/ctkWidgetsAbstractPlugin.h

@@ -22,7 +22,12 @@
 #define __ctkWidgetsAbstractPlugin_h
 
 // Qt includes
+#include <QtGlobal>
+#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
 #include <QDesignerCustomWidgetInterface>
+#else
+#include <QtUiPlugin/QDesignerCustomWidgetInterface>
+#endif
 
 // CTK includes
 #include "ctkWidgetsPluginsExport.h"

+ 5 - 0
Libs/Widgets/Plugins/ctkWidgetsPlugins.h

@@ -22,7 +22,12 @@
 #define __ctkWidgetsPlugins_h
 
 // Qt includes
+#include <QtGlobal>
+#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
 #include <QDesignerCustomWidgetCollectionInterface>
+#else
+#include <QtUiPlugin/QDesignerCustomWidgetCollectionInterface>
+#endif
 
 // CTK includes
 #include "ctkWidgetsPluginsExport.h"