Commit 09a2969c authored by Ben Boeckel's avatar Ben Boeckel

qt4: drop support

Only Qt5 is supported anymore.
parent bac03690
......@@ -57,8 +57,6 @@ function (superbuild_find_projects var)
png
python
pythonsetuptools
qt
qt4
qt5
silo
szip
......@@ -128,7 +126,7 @@ function (superbuild_sanity_check)
superbuild_qt_sanity_check()
# Sanity check: Cannot have EGL and Qt enabled at the same time.
if (egl_enabled AND (qt4_enabled OR qt5_enabled))
if (egl_enabled AND qt5_enabled)
message(SEND_ERROR "Cannot enable EGL and Qt at the same time.")
endif ()
......@@ -143,7 +141,7 @@ function (superbuild_sanity_check)
endif ()
# Sanity check: Cannot have OSMesa and Qt enabled at the same time if we're building ParaView.
if (osmesa_enabled AND (qt4_enabled OR qt5_enabled) AND paraview_enabled)
if (osmesa_enabled AND qt5_enabled AND paraview_enabled)
message(SEND_ERROR "Cannot enable OSMesa and Qt at the same time.")
endif ()
......@@ -172,11 +170,6 @@ function (superbuild_add_packaging)
endif ()
list(GET generators 0 default_generator)
if (USE_SYSTEM_qt4)
list(APPEND superbuild_export_variables
QT_LIBRARY_DIR)
endif ()
if (USE_SYSTEM_qt5)
list(APPEND superbuild_export_variables
Qt5_DIR)
......
......@@ -104,10 +104,10 @@ The `paraviewgettingstartedguide`, `paraviewtutorial`, `paraviewtutorialdata`,
and `paraviewusersguide` packages add documentation to the package.
ParaView supports multiple rendering engines including `egl`, `mesa`,
`osmesa`, and `qt4`. All of these are incompatible with each other. If none of
`osmesa`, and `qt5`. All of these are incompatible with each other. If none of
these are chosen, a UI-less ParaView will be built (basically just
`pvpython`). `qt5` is also available, but is not known to be ready. On Windows
and macOS, only the `qt` packages are available.
`pvpython`). On Windows and macOS, only the `qt5` rendering engine is
available.
The `python` package is available to enable Python support in the package. In
addition, the `matplotlib` and `numpy` packages are available.
......@@ -227,8 +227,8 @@ time.
* `ENABLE_xxx` (generally, default `OFF`): If selected, the `xxx` project
will be built within the superbuild. See above for descriptions of the
various projects. `ENABLE_` flags are not shown for projects which must be
enabled due to a project depending on it (e.g., `qt4` requires `png`, so
enabling `qt4` will hide the `ENABLE_png` option).
enabled due to a project depending on it (e.g., `visitbridge` requires
`boost`, so enabling `visitbridge` will hide the `ENABLE_boost` option).
* `USE_SYSTEM_xxx` (default `OFF`): If selected, the `xxx` project from the
build environment is used instead of building it within the superbuild.
Not all projects support system copies (the flag is not available if so).
......
......@@ -11,5 +11,5 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
include(Kitware-Camelot-Common)
set(ENABLE_mesa ON CACHE BOOL "")
set(ENABLE_qt4 ON CACHE BOOL "")
set(USE_SYSTEM_qt4 ON CACHE BOOL "")
set(ENABLE_qt5 ON CACHE BOOL "")
set(USE_SYSTEM_qt5 ON CACHE BOOL "")
......@@ -72,7 +72,7 @@ foreach (executable IN LISTS paraview_executables)
INCLUDE_REGEXES ${include_regexes})
endforeach ()
if (qt4_enabled OR qt5_enabled)
if (qt5_enabled)
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/qt.conf" "[Paths]\nPlugins = Plugins\n")
install(
FILES "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"
......@@ -158,18 +158,6 @@ if (paraviewweb_enabled)
COMPONENT "superbuild")
endif ()
foreach (qt4_plugin_path IN LISTS qt4_plugin_paths)
get_filename_component(qt4_plugin_group "${qt4_plugin_path}" DIRECTORY)
get_filename_component(qt4_plugin_group "${qt4_plugin_group}" NAME)
superbuild_apple_install_module(
"\${CMAKE_INSTALL_PREFIX}"
"${paraview_appname}"
"${qt4_plugin_path}"
"Contents/Plugins/${qt4_plugin_group}"
SEARCH_DIRECTORIES "${library_paths}")
endforeach ()
foreach (qt5_plugin_path IN LISTS qt5_plugin_paths)
get_filename_component(qt5_plugin_group "${qt5_plugin_path}" DIRECTORY)
get_filename_component(qt5_plugin_group "${qt5_plugin_group}" NAME)
......
......@@ -43,7 +43,7 @@ if (python_enabled)
endif ()
set(paraview_has_gui FALSE)
if (qt4_enabled OR qt5_enabled)
if (qt5_enabled)
list(APPEND paraview_executables
paraview)
set(paraview_has_gui TRUE)
......@@ -157,27 +157,6 @@ function (paraview_install_extra_data)
endif ()
endfunction ()
if (qt4_enabled)
include(qt4.functions)
set(qt4_plugin_prefix)
if (NOT WIN32)
set(qt4_plugin_prefix "lib")
endif ()
set(qt4_plugin_suffix)
if (WIN32)
set(qt4_plugin_suffix "4")
endif ()
set(qt4_plugins
sqldrivers/${qt4_plugin_prefix}qsqlite${qt4_plugin_suffix})
superbuild_install_qt4_plugin_paths(qt4_plugin_paths ${qt4_plugins})
else ()
set(qt4_plugin_paths)
endif ()
if (qt5_enabled)
include(qt5.functions)
......
......@@ -26,11 +26,6 @@ if (osmesa_enabled OR egl_enabled)
set(paraview_visit_gmv OFF)
endif ()
set(paraview_use_qt OFF)
if (qt4_enabled OR qt5_enabled)
set(paraview_use_qt ON)
endif ()
option(PARAVIEW_BUILD_WEB_DOCUMENTATION "Build documentation for the web" OFF)
set(paraview_all_plugins
......@@ -106,7 +101,7 @@ superbuild_add_project(paraview
DEFAULT_ON
DEPENDS_OPTIONAL
cxx11 boost hdf5 matplotlib mpi numpy png
python qt4 qt5 visitbridge zlib silo
python qt5 visitbridge zlib silo
xdmf3 ospray vrpn vtkm tbb netcdf
paraviewusersguide paraviewgettingstartedguide
paraviewtutorial paraviewtutorialdata paraviewweb
......@@ -120,8 +115,8 @@ superbuild_add_project(paraview
-DBUILD_TESTING:BOOL=OFF
-DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=ON
-DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting:BOOL=ON
-DPARAVIEW_BUILD_QT_GUI:BOOL=${paraview_use_qt}
-DPARAVIEW_ENABLE_QT_SUPPORT:BOOL=${paraview_use_qt}
-DPARAVIEW_BUILD_QT_GUI:BOOL=${qt5_enabled}
-DPARAVIEW_ENABLE_QT_SUPPORT:BOOL=${qt5_enabled}
-DPARAVIEW_ENABLE_FFMPEG:BOOL=${ffmpeg_enabled}
-DPARAVIEW_ENABLE_PYTHON:BOOL=${python_enabled}
-DPARAVIEW_ENABLE_COSMOTOOLS:BOOL=${cosmotools_enabled}
......
......@@ -32,7 +32,7 @@ endif ()
superbuild_add_project("${plugin_project}"
DEPENDS paraview ${${plugin_project}_depends}
DEPENDS_OPTIONAL ${${plugin_project}_depends_optional} qt4 qt5
DEPENDS_OPTIONAL ${${plugin_project}_depends_optional} qt5
CMAKE_ARGS
-DParaView_DIR:PATH=${paraview_binary_dir}
......
# Set suffix to be used for generating archives. This ensures that the package
# files have decent names that we can directly upload to the website.
set(package_suffix_items)
if (qt4_enabled)
list(APPEND package_suffix_items
Qt4)
endif ()
if (qt5_enabled)
list(APPEND package_suffix_items
Qt5)
......
......@@ -2,11 +2,6 @@ set(library_paths
"${superbuild_install_location}/lib"
"${superbuild_install_location}/lib/paraview-${paraview_version}")
if (QT_LIBRARY_DIR)
list(APPEND library_paths
"${QT_LIBRARY_DIR}")
endif ()
if (Qt5_DIR)
list(APPEND library_paths
"${Qt5_DIR}/../..")
......@@ -145,18 +140,6 @@ if (mpi_built_by_superbuild)
endforeach ()
endif ()
foreach (qt4_plugin_path IN LISTS qt4_plugin_paths)
get_filename_component(qt4_plugin_group "${qt4_plugin_path}" DIRECTORY)
get_filename_component(qt4_plugin_group "${qt4_plugin_group}" NAME)
superbuild_unix_install_plugin("${qt4_plugin_path}"
"lib/paraview-${paraview_version}"
"lib/paraview-${paraview_version}/${qt4_plugin_group}/"
LOADER_PATHS "${library_paths}"
INCLUDE_REGEXES ${include_regexes}
EXCLUDE_REGEXES ${exclude_regexes})
endforeach ()
if (qt5_enabled)
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/qt.conf" "")
install(
......
......@@ -8,7 +8,6 @@ function (paraviewsdk_check_system_usage project)
endfunction ()
if (paraviewsdk_enabled)
paraviewsdk_check_system_usage(qt4)
paraviewsdk_check_system_usage(qt5)
paraviewsdk_check_system_usage(mpi)
endif ()
paraview_add_plugin(vortexfinder2
PLUGIN_NAME VortexFinder2
DEPENDS boost qt cxx11
DEPENDS_OPTIONAL qt4 qt5)
DEPENDS boost qt5 cxx11)
superbuild_add_extra_cmake_args(
-DWITH_MACOS_RPATH:BOOL=FALSE)
......
......@@ -23,11 +23,6 @@ set(pvpython_description "pvpython ${paraview_version_full} (Python Shell)")
set(library_paths "lib")
if (QT_LIBRARY_DIR)
list(APPEND library_paths
"${QT_LIBRARY_DIR}")
endif ()
if (Qt5_DIR)
list(APPEND library_paths
"${Qt5_DIR}/../../../bin")
......@@ -110,16 +105,6 @@ if (paraviewweb_enabled)
COMPONENT "superbuild")
endif ()
foreach (qt4_plugin_path IN LISTS qt4_plugin_paths)
get_filename_component(qt4_plugin_group "${qt4_plugin_path}" DIRECTORY)
get_filename_component(qt4_plugin_group "${qt4_plugin_group}" NAME)
superbuild_windows_install_plugin(
"${qt4_plugin_path}"
"plugins/${qt4_plugin_group}"
"${library_paths}")
endforeach ()
foreach (qt5_plugin_path IN LISTS qt5_plugin_paths)
get_filename_component(qt5_plugin_group "${qt5_plugin_path}" DIRECTORY)
get_filename_component(qt5_plugin_group "${qt5_plugin_group}" NAME)
......
......@@ -32,7 +32,7 @@ endif ()
superbuild_add_extract_test("paraview" "${glob_prefix}" "${generator}" "${paraview_extract_dir}"
LABELS "ParaView")
if (NOT (qt4_enabled OR qt5_enabled))
if (NOT qt5_enabled)
set(paraview_exe)
endif ()
......
......@@ -56,7 +56,7 @@ function (add_paraviewsdk_example_plugin_test name)
endfunction ()
set(gui_enabled FALSE)
if (qt4_enabled OR qt5_enabled)
if (qt5_enabled)
set(gui_enabled TRUE)
endif ()
......
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