Home Explore Help
Sign In
maoting
/
CTK
Watch 1
Star 1
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

COMP: qt4/qt5: Work-around lacking of macro expansion by moc checking HAVE_QT5

Jean-Christophe Fillion-Robin 8 years ago
parent
6d5bbb189d
commit
9e3a5eb0a3
4 changed files with 4 additions and 4 deletions
Split View Show Diff Stats
  1. 1 1
      Libs/DICOM/Widgets/Plugins/ctkDICOMWidgetsPlugins.h
  2. 1 1
      Libs/Scripting/Python/Widgets/Plugins/ctkScriptingPythonWidgetsPlugins.h
  3. 1 1
      Libs/Visualization/VTK/Widgets/Plugins/ctkVTKWidgetsPlugins.h
  4. 1 1
      Libs/Widgets/Plugins/ctkWidgetsPlugins.h

+ 1 - 1
Libs/DICOM/Widgets/Plugins/ctkDICOMWidgetsPlugins.h
View File 

@@ -23,7 +23,7 @@
 
 
 // Qt includes
 
 #include <QtGlobal>
 
-#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
 
+#ifndef HAVE_QT5
 
 #include <QDesignerCustomWidgetCollectionInterface>
 
 #else
 
 #include <QtUiPlugin/QDesignerCustomWidgetCollectionInterface>

+ 1 - 1
Libs/Scripting/Python/Widgets/Plugins/ctkScriptingPythonWidgetsPlugins.h
View File 

@@ -23,7 +23,7 @@
 
 
 // Qt includes
 
 #include <QtGlobal>
 
-#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
 
+#ifndef HAVE_QT5
 
 #include <QDesignerCustomWidgetCollectionInterface>
 
 #else
 
 #include <QtUiPlugin/QDesignerCustomWidgetCollectionInterface>

+ 1 - 1
Libs/Visualization/VTK/Widgets/Plugins/ctkVTKWidgetsPlugins.h
View File 

@@ -23,7 +23,7 @@
 
 
 // Qt includes
 
 #include <QtGlobal>
 
-#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
 
+#ifndef HAVE_QT5
 
 #include <QDesignerCustomWidgetCollectionInterface>
 
 #else
 
 #include <QtUiPlugin/QDesignerCustomWidgetCollectionInterface>

+ 1 - 1
Libs/Widgets/Plugins/ctkWidgetsPlugins.h
View File 

@@ -23,7 +23,7 @@
 
 
 // Qt includes
 
 #include <QtGlobal>
 
-#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
 
+#ifndef HAVE_QT5
 
 #include <QDesignerCustomWidgetCollectionInterface>
 
 #else
 
 #include <QtUiPlugin/QDesignerCustomWidgetCollectionInterface>