Commit 0ac81858 authored by jcfr's avatar jcfr

COMP: Remove support for building against Qt WebKit module

Qt WebKit module is superseded by Qt WebEngine module
Co-authored-by: Jean-Christophe Fillion-Robin's avatarJean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
Co-authored-by: phcerdan's avatarPablo Hernandez-Cerdan <pablo.hernandez.cerdan@outlook.com>

From: Pablo Hernandez-Cerdan <pablo.hernandez.cerdan@outlook.com>

git-svn-id: http://svn.slicer.org/Slicer4/trunk@28005 3bd1e089-480b-0410-8dfb-8563597acbee
parent b9930ad9
......@@ -142,9 +142,6 @@ macro(slicerMacroBuildAppLibrary)
# Sources
# --------------------------------------------------------------------------
set(_moc_options OPTIONS -DSlicer_HAVE_QT5)
if(Slicer_HAVE_WEBKIT_SUPPORT)
set(_moc_options OPTIONS -DSlicer_HAVE_WEBKIT_SUPPORT)
endif()
QT5_WRAP_CPP(SLICERAPPLIB_MOC_OUTPUT ${SLICERAPPLIB_MOC_SRCS} ${_moc_options})
QT5_WRAP_UI(SLICERAPPLIB_UI_CXX ${SLICERAPPLIB_UI_SRCS})
if(DEFINED SLICERAPPLIB_RESOURCES)
......
......@@ -139,9 +139,6 @@ macro(SlicerMacroBuildBaseQtLibrary)
# Sources
# --------------------------------------------------------------------------
set(_moc_options OPTIONS -DSlicer_HAVE_QT5)
if(Slicer_HAVE_WEBKIT_SUPPORT)
set(_moc_options OPTIONS -DSlicer_HAVE_WEBKIT_SUPPORT)
endif()
QT5_WRAP_CPP(SLICERQTBASELIB_MOC_OUTPUT ${SLICERQTBASELIB_MOC_SRCS} ${_moc_options})
QT5_WRAP_UI(SLICERQTBASELIB_UI_CXX ${SLICERQTBASELIB_UI_SRCS})
if(DEFINED SLICERQTBASELIB_RESOURCES)
......
......@@ -132,9 +132,6 @@ macro(slicerMacroBuildLoadableModule)
endif()
set(_moc_options OPTIONS -DSlicer_HAVE_QT5)
if(Slicer_HAVE_WEBKIT_SUPPORT)
set(_moc_options OPTIONS -DSlicer_HAVE_WEBKIT_SUPPORT)
endif()
QT5_WRAP_CPP(LOADABLEMODULE_MOC_OUTPUT ${LOADABLEMODULE_MOC_SRCS} ${_moc_options})
QT5_WRAP_UI(LOADABLEMODULE_UI_CXX ${LOADABLEMODULE_UI_SRCS})
if(DEFINED LOADABLEMODULE_RESOURCES)
......
......@@ -120,9 +120,6 @@ macro(SlicerMacroBuildModuleQtLibrary)
endif()
set(_moc_options OPTIONS -DSlicer_HAVE_QT5)
if(Slicer_HAVE_WEBKIT_SUPPORT)
set(_moc_options OPTIONS -DSlicer_HAVE_WEBKIT_SUPPORT)
endif()
QT5_WRAP_CPP(MODULEQTLIBRARY_MOC_OUTPUT ${MODULEQTLIBRARY_MOC_SRCS} ${_moc_options})
QT5_WRAP_UI(MODULEQTLIBRARY_UI_CXX ${MODULEQTLIBRARY_UI_SRCS})
if(DEFINED MODULEQTLIBRARY_RESOURCES AND NOT MODULEQTLIBRARY_RESOURCES STREQUAL "")
......
......@@ -547,17 +547,11 @@ endif()
Svg Sql
)
find_package(Qt5 COMPONENTS Core QUIET)
if(Qt5_VERSION VERSION_LESS "5.6.0")
list(APPEND Slicer_REQUIRED_QT_MODULES
WebKit
)
else()
list(APPEND Slicer_REQUIRED_QT_MODULES
WebEngine
WebEngineWidgets
WebChannel
)
endif()
if(Slicer_BUILD_EXTENSIONMANAGER_SUPPORT)
list(APPEND Slicer_REQUIRED_QT_MODULES Script)
endif()
......@@ -596,11 +590,7 @@ include(SlicerBlockFindQtAndCheckVersion)
mark_as_superbuild(VARS Qt5_DIR LABELS "FIND_PACKAGE")
set(Slicer_HAVE_QT5 1)
set(Slicer_HAVE_WEBKIT_SUPPORT 1)
if(Qt5_VERSION VERSION_GREATER "5.5.0")
set(Slicer_HAVE_WEBKIT_SUPPORT 0)
endif()
#
# If qmake or Qt5Config are associated with a system location, explicitly mark Qt as such. Doing so
......
......@@ -46,11 +46,7 @@ endif()
# Configure headers
# --------------------------------------------------------------------------
set(MRML_WIDGETS_HAVE_QT5 1)
set(MRML_WIDGETS_HAVE_WEBKIT_SUPPORT 1)
if(Qt5_VERSION VERSION_GREATER "5.5.0")
set(MRML_WIDGETS_HAVE_WEBKIT_SUPPORT 0)
endif()
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/qMRMLWidgetsConfigure.h.in
......@@ -396,9 +392,6 @@ if(Slicer_USE_QtTesting)
endif()
set(_moc_options OPTIONS -DMRML_WIDGETS_HAVE_QT5)
if(MRML_WIDGETS_HAVE_WEBKIT_SUPPORT)
set(_moc_options OPTIONS -DMRML_WIDGETS_HAVE_WEBKIT_SUPPORT)
endif()
QT5_WRAP_CPP(MRMLWidgets_MOC_CXX ${MRMLWidgets_MOC_SRCS} ${_moc_options})
QT5_WRAP_UI(MRMLWidgets_UI_CXX ${MRMLWidgets_UI_SRCS})
QT5_ADD_RESOURCES(MRMLWidgets_QRC_CXX ${MRMLWidgets_QRC_SRCS})
......
......@@ -150,9 +150,6 @@ set(KIT_TEST_GENERATE_MOC_SRCS
qMRMLSliceControllerWidgetTest.cxx
)
set(_moc_options OPTIONS -DMRML_WIDGETS_HAVE_QT5)
if(MRML_WIDGETS_HAVE_WEBKIT_SUPPORT)
set(_moc_options OPTIONS -DMRML_WIDGETS_HAVE_WEBKIT_SUPPORT)
endif()
QT5_WRAP_CPP(Tests_MOC_CXX ${Tests_MOC_SRCS} ${_moc_options})
QT5_GENERATE_MOCS(${KIT_TEST_GENERATE_MOC_SRCS})
......
......@@ -28,9 +28,6 @@ if(NOT DEFINED CTK_DIR AND NOT Slicer_USE_SYSTEM_${proj})
set(EXTERNAL_PROJECT_OPTIONAL_CMAKE_CACHE_ARGS)
set(_wrap_qtwebkit 0)
if(Qt5_VERSION VERSION_LESS "5.6.0")
set(_wrap_qtwebkit ${Slicer_USE_PYTHONQT})
endif()
if(Slicer_USE_PYTHONQT)
list(APPEND EXTERNAL_PROJECT_OPTIONAL_CMAKE_CACHE_ARGS
......
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