Commit ecb5d4b7 authored by Ben Boeckel's avatar Ben Boeckel

qt: support Qt 5.5's class movements

QtDeclarative seems to be dissolving.
parent ddde1bfa
......@@ -30,6 +30,11 @@ IF( NOT Qt5_FIND_COMPONENTS )
Widgets
Xml
)
if (NOT Qt5Core_VERSION_STRING VERSION_LESS "5.5.0")
list(APPEND Qt5_FIND_COMPONENTS
UiPlugin)
endif ()
ENDIF()
IF( Qt5Core_FOUND )
......
......@@ -333,6 +333,7 @@ if (PARAVIEW_QT_VERSION VERSION_GREATER "4")
set (${vtk-module}_INCLUDE_DIRS
${Qt5Widgets_INCLUDE_DIRS}
${Qt5UiTools_INCLUDE_DIRS}
${Qt5UiPlugin_INCLUDE_DIRS}
${Qt5Xml_INCLUDE_DIRS})
else ()
# import Qt4 build settings
......
......@@ -33,7 +33,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "pqFormBuilder.h"
#include <QtDesigner/QDesignerCustomWidgetInterface>
#if QT_VERSION >= 0x050500
#include <QtUiPlugin/QDesignerCustomWidgetCollectionInterface>
#else
#include <QtDesigner/QDesignerCustomWidgetCollectionInterface>
#endif
#include <QPluginLoader>
#include <QCoreApplication>
#include <QWidget>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment