From 3efae11c36fb02d627c969dacd68165c7fd20349 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 29 Apr 2024 15:01:01 +0200 Subject: [PATCH] [vtkm|vtk|paraview] update ports (#37119) closes #36801 closes #36253 closes #36044 ~~includes #24327 to fix dlib linkage in the osx pipelines.~~ Need to look at ~~#36044~~ ~~#36345~~ merge after - [x] #37561 --------- Co-authored-by: Alexander Neumann Co-authored-by: Billy Robert O'Neal III --- .../vcpkg-cmake-wrapper.cmake.in | 6 +- ports/lapack-reference/vcpkg.json | 2 +- ports/openmvs/fix-static-build.patch | 19 + ports/openmvs/portfile.cmake | 2 +- ports/openmvs/vcpkg.json | 2 +- ports/paraview/53.diff | 506 ---- ports/paraview/external_vtk.patch | 148 - ports/paraview/fix-build.patch | 45 + ports/paraview/fix-configure.patch | 35 + ports/paraview/portfile.cmake | 78 +- ports/paraview/python_include.patch | 13 - ports/paraview/python_wrapper.patch | 19 - ports/paraview/qt6-all.patch | 2585 ----------------- ports/paraview/vcpkg.json | 3 +- ports/vtk-m/fix-build.patch | 38 + ports/vtk-m/omp.patch | 14 +- ports/vtk-m/portfile.cmake | 36 +- ports/vtk-m/vcpkg.json | 3 +- ports/vtk/10945.diff | 195 ++ ports/vtk/10972.diff | 151 + ports/vtk/9690.diff | 27 - ports/vtk/devendor_exodusII.patch | 70 + ports/vtk/fast-float.patch | 12 + ports/vtk/fix-exprtk.patch | 13 + ports/vtk/libproj.patch | 5 +- ports/vtk/missing-include-fixes.patch | 40 - ports/vtk/ot-dep.patch | 33 + ports/vtk/pegtl.patch | 89 +- ports/vtk/portfile.cmake | 82 +- ports/vtk/pythonwrapper.patch | 27 +- ports/vtk/vcpkg.json | 11 +- ports/vtk/vtkioss.patch | 42 +- ports/vtk/vtkm.patch | 92 +- scripts/ci.baseline.txt | 1 + versions/baseline.json | 16 +- versions/l-/lapack-reference.json | 5 + versions/o-/openmvs.json | 5 + versions/p-/paraview.json | 5 + versions/v-/vtk-m.json | 5 + versions/v-/vtk.json | 5 + 40 files changed, 893 insertions(+), 3592 deletions(-) create mode 100644 ports/openmvs/fix-static-build.patch delete mode 100644 ports/paraview/53.diff delete mode 100644 ports/paraview/external_vtk.patch create mode 100644 ports/paraview/fix-build.patch create mode 100644 ports/paraview/fix-configure.patch delete mode 100644 ports/paraview/python_include.patch delete mode 100644 ports/paraview/python_wrapper.patch delete mode 100644 ports/paraview/qt6-all.patch create mode 100644 ports/vtk-m/fix-build.patch create mode 100644 ports/vtk/10945.diff create mode 100644 ports/vtk/10972.diff delete mode 100644 ports/vtk/9690.diff create mode 100644 ports/vtk/devendor_exodusII.patch create mode 100644 ports/vtk/fast-float.patch create mode 100644 ports/vtk/fix-exprtk.patch delete mode 100644 ports/vtk/missing-include-fixes.patch create mode 100644 ports/vtk/ot-dep.patch diff --git a/ports/lapack-reference/vcpkg-cmake-wrapper.cmake.in b/ports/lapack-reference/vcpkg-cmake-wrapper.cmake.in index 43ee87ea34..e9d6743f29 100644 --- a/ports/lapack-reference/vcpkg-cmake-wrapper.cmake.in +++ b/ports/lapack-reference/vcpkg-cmake-wrapper.cmake.in @@ -22,10 +22,10 @@ unset(BLA_STATIC) if(@CBLAS@) include(SelectLibraryConfigurations) - find_library(CBLAS_LIBRARY_RELEASE NAMES libcblas PATHS "${CURRENT_PACKAGES_DIR}/lib" NO_DEFAULT_PATH) - find_library(CBLAS_LIBRARY_DEBUG NAMES libcblas PATHS "${CURRENT_PACKAGES_DIR}/debug/lib" NO_DEFAULT_PATH) + find_library(CBLAS_LIBRARY_RELEASE NAMES libcblas cblas PATHS "${CURRENT_PACKAGES_DIR}/lib" NO_DEFAULT_PATH) + find_library(CBLAS_LIBRARY_DEBUG NAMES libcblas cblas PATHS "${CURRENT_PACKAGES_DIR}/debug/lib" NO_DEFAULT_PATH) select_library_configurations(CBLAS) - set(LAPACK_LIBRARIES ${LAPACK_LIBRARIES}) + set(LAPACK_LIBRARIES ${LAPACK_LIBRARIES} ${CBLAS_LIBRARIES}) endif() set(CMAKE_MODULE_PATH "${LAPACK_PREV_MODULE_PATH}") diff --git a/ports/lapack-reference/vcpkg.json b/ports/lapack-reference/vcpkg.json index f9132bef42..684be12305 100644 --- a/ports/lapack-reference/vcpkg.json +++ b/ports/lapack-reference/vcpkg.json @@ -1,7 +1,7 @@ { "name": "lapack-reference", "version": "3.11.0", - "port-version": 5, + "port-version": 6, "description": "LAPACK - Linear Algebra PACKage", "homepage": "https://netlib.org/lapack/", "license": "BSD-3-Clause-Open-MPI", diff --git a/ports/openmvs/fix-static-build.patch b/ports/openmvs/fix-static-build.patch new file mode 100644 index 0000000000..47e459fb45 --- /dev/null +++ b/ports/openmvs/fix-static-build.patch @@ -0,0 +1,19 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 39ec359ac3..03225b8940 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -177,10 +177,10 @@ if(Boost_FOUND) + LIST(APPEND OpenMVS_DEFINITIONS -D_USE_BOOST) + ADD_DEFINITIONS(${Boost_DEFINITIONS}) + LINK_DIRECTORIES(${Boost_LIBRARY_DIRS}) +- if(NOT MSVC AND DEFINED CMAKE_TOOLCHAIN_FILE) +- # work around this missing library link in vcpkg +- LIST(APPEND Boost_LIBRARIES zstd) +- endif() ++ LINK_LIBRARIES(${Boost_LIBRARIES}) ++ find_package(zstd CONFIG REQUIRED) ++ LINK_LIBRARIES($,zstd::libzstd_shared,zstd::libzstd_static>) ++ + SET(_USE_BOOST TRUE) + endif() + diff --git a/ports/openmvs/portfile.cmake b/ports/openmvs/portfile.cmake index 0ed1eb5916..3c2ae27808 100644 --- a/ports/openmvs/portfile.cmake +++ b/ports/openmvs/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_from_github( PATCHES fix-build.patch no-absolute-paths.patch - fix_no_zstd.patch + fix-static-build.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/openmvs/vcpkg.json b/ports/openmvs/vcpkg.json index 27b59511dc..e89a480906 100644 --- a/ports/openmvs/vcpkg.json +++ b/ports/openmvs/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openmvs", "version": "2.1.0", - "port-version": 3, + "port-version": 4, "description": "OpenMVS: open Multi-View Stereo reconstruction library", "homepage": "https://cdcseacave.github.io/openMVS", "license": "AGPL-3.0-only", diff --git a/ports/paraview/53.diff b/ports/paraview/53.diff deleted file mode 100644 index 44f4c550fe..0000000000 --- a/ports/paraview/53.diff +++ /dev/null @@ -1,506 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b3c91500041421328fde0821ef6876c78eef55d6..b4157a3d53407b536b3694b12faa3ed7794fb4c5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,27 +1,20 @@ --if (NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) -- CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12) --endif () -+CMAKE_MINIMUM_REQUIRED(VERSION 3.2) - - PROJECT(QtTesting) - - IF(NOT DEFINED QtTesting_QT_VERSION) -- SET(QtTesting_QT_VERSION "4" CACHE STRING "Expected Qt version") -+ SET(QtTesting_QT_VERSION "5" CACHE STRING "Expected Qt version") - MARK_AS_ADVANCED(QtTesting_QT_VERSION) -- SET_PROPERTY(CACHE QtTesting_QT_VERSION PROPERTY STRINGS 4 5) -+ SET_PROPERTY(CACHE QtTesting_QT_VERSION PROPERTY STRINGS 5 6) - ENDIF() --IF(NOT (QtTesting_QT_VERSION VERSION_EQUAL "4" OR -- QtTesting_QT_VERSION VERSION_EQUAL "5")) -- message(FATAL_ERROR "Expected value for QtTesting_QT_VERSION is either '4' or '5'") -+IF(NOT (QtTesting_QT_VERSION VERSION_EQUAL "5" OR -+ QtTesting_QT_VERSION VERSION_EQUAL "6")) -+ message(FATAL_ERROR "Expected value for QtTesting_QT_VERSION is either '5' or '6'") - ENDIF() - - set(qt_imported_targets) --IF(QtTesting_QT_VERSION VERSION_GREATER "4") -- FIND_PACKAGE(Qt5 REQUIRED COMPONENTS Core Widgets) -- SET(qt_imported_targets Qt5::Core Qt5::Widgets) --ELSE() -- FIND_PACKAGE(Qt4 REQUIRED COMPONENTS QtGui) -- SET(qt_imported_targets Qt4::QtCore Qt4::QtGui) --ENDIF() -+FIND_PACKAGE(Qt${QtTesting_QT_VERSION} REQUIRED COMPONENTS Core Widgets) -+SET(qt_imported_targets Qt${QtTesting_QT_VERSION}::Core Qt${QtTesting_QT_VERSION}::Widgets) - - IF(NOT DEFINED QT_TESTING_WITH_PYTHON) - OPTION(QT_TESTING_WITH_PYTHON "Enable Qt Testing with Python" OFF) -diff --git a/Testing/CMake/qtTestingMacroGenerateMocs.cmake b/Testing/CMake/qtTestingMacroGenerateMocs.cmake -index 4b1f34a4fa5d7e7effb63ae49518e75c47e2598c..953e7402bc269cf3af41914945b194348cfc428a 100644 ---- a/Testing/CMake/qtTestingMacroGenerateMocs.cmake -+++ b/Testing/CMake/qtTestingMacroGenerateMocs.cmake -@@ -19,3 +19,13 @@ macro(QT5_GENERATE_MOCS) - OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${moc_file}) - endforeach() - endmacro() -+ -+ -+macro(QT6_GENERATE_MOCS) -+ foreach(file ${ARGN}) -+ set(moc_file moc_${file}) -+ QT_GENERATE_MOC(${file} ${moc_file}) -+ set_property(SOURCE ${file} APPEND PROPERTY -+ OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${moc_file}) -+ endforeach() -+endmacro() -diff --git a/Testing/Cpp/CMakeLists.txt b/Testing/Cpp/CMakeLists.txt -index fed244434f888af3ba2f4b50609f94d08eebd47b..31e629c990290bb5d4fce52005c1781aebdf3b5a 100644 ---- a/Testing/Cpp/CMakeLists.txt -+++ b/Testing/Cpp/CMakeLists.txt -@@ -1,6 +1,9 @@ - include(../CMake/qtTestingMacroGenerateMocs.cmake) - --IF(QtTesting_QT_VERSION VERSION_GREATER "4") -+IF(QtTesting_QT_VERSION VERSION_GREATER "5") -+ FIND_PACKAGE(Qt6 REQUIRED QUIET COMPONENTS Test) -+ SET(TEST_LIBRARIES Qt6::Test) -+ELSEIF(QtTesting_QT_VERSION VERSION_GREATER "4") - FIND_PACKAGE(Qt5 REQUIRED QUIET COMPONENTS Test) - SET(TEST_LIBRARIES Qt5::Test) - ELSE() -@@ -38,7 +41,10 @@ include_directories( - ${CMAKE_CURRENT_SOURCE_DIR} - ) - --if(QtTesting_QT_VERSION VERSION_GREATER "4") -+if(QtTesting_QT_VERSION VERSION_GREATER "5") -+ QT6_GENERATE_MOCS(${TEST_SOURCES}) -+ QT6_WRAP_CPP( TEST_MOC_SRCS ${TEST_MOC_HEADERS} ) -+elseif(QtTesting_QT_VERSION VERSION_GREATER "4") - QT5_GENERATE_MOCS(${TEST_SOURCES}) - QT5_WRAP_CPP( TEST_MOC_SRCS ${TEST_MOC_HEADERS} ) - else() -diff --git a/pq3DViewEventPlayer.cxx b/pq3DViewEventPlayer.cxx -index 5be26b88d394ee82543b039e2173f7624e960808..3ec526a9033328cc924f02dd4c0ba21f30b9a7de 100644 ---- a/pq3DViewEventPlayer.cxx -+++ b/pq3DViewEventPlayer.cxx -@@ -35,7 +35,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include - #include - #include --#include -+#include - #include - #include - -@@ -53,18 +53,19 @@ bool pq3DViewEventPlayer::playEvent( - { - if (Command == "mousePress" || Command == "mouseRelease" || Command == "mouseMove") - { -- QRegExp mouseRegExp("\\(([^,]*),([^,]*),([^,]),([^,]),([^,]*)\\)"); -- if (mouseRegExp.indexIn(Arguments) != -1) -+ QRegularExpression mouseRegExp("\\(([^,]*),([^,]*),([^,]),([^,]),([^,]*)\\)"); -+ QRegularExpressionMatch match = mouseRegExp.match(Arguments); -+ if (match.hasMatch()) - { -- QVariant v = mouseRegExp.cap(1); -+ QVariant v = match.captured(1); - int x = static_cast(v.toDouble() * widget->size().width()); -- v = mouseRegExp.cap(2); -+ v = match.captured(2); - int y = static_cast(v.toDouble() * widget->size().height()); -- v = mouseRegExp.cap(3); -+ v = match.captured(3); - Qt::MouseButton button = static_cast(v.toInt()); -- v = mouseRegExp.cap(4); -+ v = match.captured(4); - Qt::MouseButtons buttons = static_cast(v.toInt()); -- v = mouseRegExp.cap(5); -+ v = match.captured(5); - Qt::KeyboardModifiers keym = static_cast(v.toInt()); - QEvent::Type type = (Command == "mousePress") - ? QEvent::MouseButtonPress -diff --git a/pq3DViewEventTranslator.cxx b/pq3DViewEventTranslator.cxx -index e42b28ec22ef24f07b5adffb1fb7740df320adf5..17f7b2d9e17a36b926c585f85ce37c1ee21b6eff 100644 ---- a/pq3DViewEventTranslator.cxx -+++ b/pq3DViewEventTranslator.cxx -@@ -71,8 +71,13 @@ bool pq3DViewEventTranslator::translateEvent(QObject* Object, QEvent* Event, boo - if (mouseEvent) - { - QSize size = widget->size(); -+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) -+ double normalized_x = mouseEvent->position().x() / static_cast(size.width()); -+ double normalized_y = mouseEvent->position().y() / static_cast(size.height()); -+#else - double normalized_x = mouseEvent->x() / static_cast(size.width()); - double normalized_y = mouseEvent->y() / static_cast(size.height()); -+#endif - int button = mouseEvent->button(); - int buttons = mouseEvent->buttons(); - int modifiers = mouseEvent->modifiers(); -@@ -88,7 +93,10 @@ bool pq3DViewEventTranslator::translateEvent(QObject* Object, QEvent* Event, boo - QMouseEvent e(QEvent::MouseButtonPress, QPoint(), Qt::MouseButton(), Qt::MouseButtons(), - Qt::KeyboardModifiers()); - -+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) -+ // FIXME: QMouseEvent copy ctor is private in Qt6 - lastMoveEvent = e; -+#endif - return true; - break; - } -@@ -98,10 +106,18 @@ bool pq3DViewEventTranslator::translateEvent(QObject* Object, QEvent* Event, boo - QMouseEvent* mouseEvent = dynamic_cast(Event); - if (mouseEvent) - { -+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) -+ QMouseEvent e(QEvent::MouseMove, -+ QPoint(mouseEvent->position().x(), mouseEvent->position().y()), -+#else - QMouseEvent e(QEvent::MouseMove, QPoint(mouseEvent->x(), mouseEvent->y()), -+#endif - mouseEvent->button(), mouseEvent->buttons(), mouseEvent->modifiers()); - -+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) -+ // FIXME: QMouseEvent copy ctor is private in Qt6 - lastMoveEvent = e; -+#endif - } - return true; - break; -@@ -117,8 +133,13 @@ bool pq3DViewEventTranslator::translateEvent(QObject* Object, QEvent* Event, boo - // record last move event if it is valid - if (lastMoveEvent.type() == QEvent::MouseMove) - { -+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) -+ double normalized_x = lastMoveEvent.position().x() / static_cast(size.width()); -+ double normalized_y = lastMoveEvent.position().y() / static_cast(size.height()); -+#else - double normalized_x = lastMoveEvent.x() / static_cast(size.width()); - double normalized_y = lastMoveEvent.y() / static_cast(size.height()); -+#endif - int button = lastMoveEvent.button(); - int buttons = lastMoveEvent.buttons(); - int modifiers = lastMoveEvent.modifiers(); -@@ -131,8 +152,13 @@ bool pq3DViewEventTranslator::translateEvent(QObject* Object, QEvent* Event, boo - .arg(modifiers)); - } - -+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) -+ double normalized_x = mouseEvent->position().x() / static_cast(size.width()); -+ double normalized_y = mouseEvent->position().y() / static_cast(size.height()); -+#else - double normalized_x = mouseEvent->x() / static_cast(size.width()); - double normalized_y = mouseEvent->y() / static_cast(size.height()); -+#endif - int button = mouseEvent->button(); - int buttons = mouseEvent->buttons(); - int modifiers = mouseEvent->modifiers(); -diff --git a/pqAbstractButtonEventTranslator.cxx b/pqAbstractButtonEventTranslator.cxx -index ad785ec90b564cde7fc5146e8060da8daf0cb459..bdcdced3de5248324b1bcca791026202878000b9 100644 ---- a/pqAbstractButtonEventTranslator.cxx -+++ b/pqAbstractButtonEventTranslator.cxx -@@ -36,6 +36,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include - #include - #include -+#include - #include - #include - #include -diff --git a/pqAbstractItemViewEventPlayer.cxx b/pqAbstractItemViewEventPlayer.cxx -index 95860b099bae0c71b0b37aab980d06eb5d1caf1e..9ab04ae0e954a295b12b910e7e050bafd24555b2 100644 ---- a/pqAbstractItemViewEventPlayer.cxx -+++ b/pqAbstractItemViewEventPlayer.cxx -@@ -48,7 +48,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - /// Converts a string representation of a model index into the real thing - static QModelIndex OldGetIndex(QAbstractItemView& View, const QString& Name) - { -+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) -+ QStringList rows = Name.split('/', Qt::SkipEmptyParts); -+#else - QStringList rows = Name.split('/', QString::SkipEmptyParts); -+#endif - QString column; - - if (rows.size()) -@@ -88,7 +92,11 @@ static QModelIndex GetIndexByItemName(QAbstractItemView& View, const QString& Na - - static QModelIndex GetIndex(QAbstractItemView* View, const QString& Name) - { -+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) -+ QStringList idxs = Name.split('/', Qt::SkipEmptyParts); -+#else - QStringList idxs = Name.split('/', QString::SkipEmptyParts); -+#endif - - QModelIndex index; - for (int i = 0; i != idxs.size(); ++i) -@@ -200,7 +208,8 @@ bool pqAbstractItemViewEventPlayer::playEvent( - if (Command == "mouseWheel") - { - int delta = args[0].toInt(); -- QWheelEvent we(QPoint(x, y), delta, buttons, keym); -+ QWheelEvent we(QPointF(x, y), QPointF(x, y), QPoint(0, 0), QPoint(0, delta), buttons, keym, -+ Qt::NoScrollPhase, false); - QCoreApplication::sendEvent(Object, &we); - return true; - } -diff --git a/pqAbstractItemViewEventPlayerBase.cxx b/pqAbstractItemViewEventPlayerBase.cxx -index 8a523e668e4f8d37caae67787ab15cdd3ef7f9ff..fc52293a226a663f87e59246a60f94815e536900 100644 ---- a/pqAbstractItemViewEventPlayerBase.cxx -+++ b/pqAbstractItemViewEventPlayerBase.cxx -@@ -163,11 +163,12 @@ bool pqAbstractItemViewEventPlayerBase::playEvent( - return false; - } - -- QRegExp regExp1("^([\\d\\.]+),(\\d+)$"); -- if (command == "setCheckState" && regExp1.indexIn(arguments) != -1) -+ QRegularExpression regExp1("^([\\d\\.]+),(\\d+)$"); -+ QRegularExpressionMatch match = regExp1.match(arguments); -+ if (command == "setCheckState" && match.hasMatch()) - { -- QString strIndex = regExp1.cap(1); -- int check_state = regExp1.cap(2).toInt(); -+ QString strIndex = match.captured(1); -+ int check_state = match.captured(2).toInt(); - - QModelIndex index = - pqAbstractItemViewEventPlayerBase::GetIndex(strIndex, abstractItemView, error); -diff --git a/pqAbstractItemViewEventTranslator.cxx b/pqAbstractItemViewEventTranslator.cxx -index b769cca66eab194773d5338171152715181efaa3..07f7b42071582906fcbdbbc149a69773c92b31e6 100644 ---- a/pqAbstractItemViewEventTranslator.cxx -+++ b/pqAbstractItemViewEventTranslator.cxx -@@ -153,11 +153,19 @@ bool pqAbstractItemViewEventTranslator::translateEvent(QObject* Object, QEvent* - if (wheelEvent) - { - QString idxStr; -+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) -+ QModelIndex idx = object->indexAt(wheelEvent->position().toPoint()); -+#else - QModelIndex idx = object->indexAt(wheelEvent->pos()); -+#endif - idxStr = toIndexStr(idx); - QRect r = object->visualRect(idx); -+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) -+ relPt = wheelEvent->position().toPoint() - r.topLeft(); -+#else - relPt = wheelEvent->pos() - r.topLeft(); -- int numStep = wheelEvent->delta() > 0 ? 120 : -120; -+#endif -+ int numStep = wheelEvent->angleDelta().y() > 0 ? 120 : -120; - int buttons = wheelEvent->buttons(); - int modifiers = wheelEvent->modifiers(); - Q_EMIT recordEvent(Object, "mouseWheel", QString("%1,%2,%3,%4,%5") -diff --git a/pqBasicWidgetEventPlayer.cxx b/pqBasicWidgetEventPlayer.cxx -index 27663a340efb87b92fc4ce10ac393238e8925e95..11ac0d577d53b66e7f624354292a70fb26b553d3 100644 ---- a/pqBasicWidgetEventPlayer.cxx -+++ b/pqBasicWidgetEventPlayer.cxx -@@ -83,7 +83,8 @@ bool pqBasicWidgetEventPlayer::playEvent( - if (command == "mouseWheel") - { - int delta = args[0].toInt(); -- QWheelEvent we(QPoint(x, y), delta, buttons, keym); -+ QWheelEvent we(QPoint(x, y), QPoint(x, y), QPoint(0, 0), QPoint(0, delta), buttons, -+ keym, Qt::NoScrollPhase, false); - QCoreApplication::sendEvent(object, &we); - return true; - } -diff --git a/pqBasicWidgetEventTranslator.cxx b/pqBasicWidgetEventTranslator.cxx -index bdbc340cb9714aea681024d24055be113f6b1bd4..57026f6a65408252602765ad6de6771fef58afa8 100644 ---- a/pqBasicWidgetEventTranslator.cxx -+++ b/pqBasicWidgetEventTranslator.cxx -@@ -80,8 +80,13 @@ bool pqBasicWidgetEventTranslator::translateEvent( - .arg(mouseEvent->button()) - .arg(mouseEvent->buttons()) - .arg(mouseEvent->modifiers()) -+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) -+ .arg(mouseEvent->position().x()) -+ .arg(mouseEvent->position().y()); -+#else - .arg(mouseEvent->x()) - .arg(mouseEvent->y()); -+#endif - - if (event->type() != QEvent::MouseButtonRelease) - { -@@ -116,13 +121,18 @@ bool pqBasicWidgetEventTranslator::translateEvent( - { - int buttons = wheelEvent->buttons(); - int modifiers = wheelEvent->modifiers(); -- int numStep = wheelEvent->delta(); -+ int numStep = wheelEvent->angleDelta().y() > 0 ? 120 : -120; - Q_EMIT recordEvent(object, "mouseWheel", QString("%1,%2,%3,%4,%5") - .arg(numStep) - .arg(buttons) - .arg(modifiers) -- .arg(wheelEvent->x()) -- .arg(wheelEvent->y())); -+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) -+ .arg(wheelEvent->position().x()) -+ .arg(wheelEvent->position().y())); -+#else -+ .arg(wheelEvent->pos().x()) -+ .arg(wheelEvent->pos().y())); -+#endif - } - } - return true; -diff --git a/pqEventRecorder.cxx b/pqEventRecorder.cxx -index e20b15ef096a68f5126e387dbfb551a8a5a01c31..8737dfa9fefdbcbe5e9df6dda1621f043e345b69 100644 ---- a/pqEventRecorder.cxx -+++ b/pqEventRecorder.cxx -@@ -192,8 +192,10 @@ void pqEventRecorder::start() - // Set the device - this->Stream.setDevice(this->File); - -+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - // Set UTF8 Codec - this->Stream.setCodec("UTF-8"); -+#endif - - // Set the Stream to the Observer - this->ActiveObserver->setStream(&this->Stream); -diff --git a/pqEventTranslator.cxx b/pqEventTranslator.cxx -index beb7be450741abef46cee21f11f502ecf84f0552..9d9d691848847e47ad2596bea4134e1ccb14665d 100644 ---- a/pqEventTranslator.cxx -+++ b/pqEventTranslator.cxx -@@ -103,7 +103,7 @@ struct pqEventTranslator::pqImplementation - /// Stores the working set of widget translators - QList Translators; - /// Stores the set of objects that should be ignored when translating events -- QMap IgnoredObjects; -+ QMap IgnoredObjects; - - // list of widgets for which mouse propagation will happen - // we'll only translate the first and ignore the rest -@@ -272,7 +272,7 @@ pqEventComment* pqEventTranslator::eventComment() const - } - - // ---------------------------------------------------------------------------- --void pqEventTranslator::ignoreObject(QObject* object, QRegExp commandFilter) -+void pqEventTranslator::ignoreObject(QObject* object, QRegularExpression commandFilter) - { - this->Implementation->IgnoredObjects.insert(object, commandFilter); - } -@@ -353,11 +353,21 @@ bool pqEventTranslator::eventFilter(QObject* object, QEvent* event) - { - // Check it is not the overlay, and it contains the mouse cursor - if (topWidget != this->Implementation->CheckOverlay && -+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) -+ topWidget->geometry().contains( -+ static_cast(event)->globalPosition().toPoint(), true)) -+#else - topWidget->geometry().contains(static_cast(event)->globalPos(), true)) -+#endif - { - // Recover the child widget onder the cursor, if any - QWidget* childWidget = topWidget->childAt( -+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) -+ topWidget->mapFromGlobal( -+ static_cast(event)->globalPosition().toPoint())); -+#else - topWidget->mapFromGlobal(static_cast(event)->globalPos())); -+#endif - - // If child exist, check it is not the overlayed widget and indeed a new widget - if (childWidget == NULL || -@@ -583,7 +593,7 @@ void pqEventTranslator::onRecordEvent( - { - if (this->Implementation->IgnoredObjects.contains(Object)) - { -- QRegExp commandFilter = this->Implementation->IgnoredObjects.value(Object); -+ QRegularExpression commandFilter = this->Implementation->IgnoredObjects.value(Object); - if (Command.contains(commandFilter)) - { - return; -diff --git a/pqEventTranslator.h b/pqEventTranslator.h -index d756bec96f42db4db8e28517a0d610cbef0e1ef4..4b0549f6d794cfeb43ecd6ea2644a5067e25c34d 100644 ---- a/pqEventTranslator.h -+++ b/pqEventTranslator.h -@@ -36,7 +36,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include "QtTestingExport.h" - #include - #include --#include -+#include - - class pqEventComment; - class pqTestUtility; -@@ -92,8 +92,8 @@ public: - /// translating events which command is equivalent to the regexp - /// (useful to prevent recording UI events from being - /// captured as part of the recording) -- void ignoreObject( -- QObject* object, QRegExp commandFilter = QRegExp("*", Qt::CaseInsensitive, QRegExp::Wildcard)); -+ void ignoreObject(QObject* object, QRegularExpression commandFilter = QRegularExpression( -+ "*", QRegularExpression::CaseInsensitiveOption)); - - /// start listening to the GUI and translating events - void start(); -diff --git a/pqObjectNaming.h b/pqObjectNaming.h -index d31b28d4a4f8275232331af860699796c77c2114..5cef1618d431d26f38cf10d2649e2dc5202f737f 100644 ---- a/pqObjectNaming.h -+++ b/pqObjectNaming.h -@@ -38,7 +38,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include "QtTestingExport.h" - - class QObject; -+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - class QStringList; -+#endif - - /// Provides functionality to ensuring that Qt objects can be uniquely identified for recording and - /// playback of regression tests -diff --git a/pqPlayBackEventsDialog.cxx b/pqPlayBackEventsDialog.cxx -index d8b3e9547d146fb68dd6c61942b825ae67cd67ec..ff0ebb926c3f49b29f1bce06fa36c4e65a889b0c 100644 ---- a/pqPlayBackEventsDialog.cxx -+++ b/pqPlayBackEventsDialog.cxx -@@ -350,7 +350,9 @@ void pqPlayBackEventsDialog::onStarted(const QString& filename) - file.open(QIODevice::ReadOnly); - this->Implementation->Ui.logBrowser->append(QString("Start file : %1").arg(infoFile.fileName())); - QTextStream stream(&file); -+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - stream.setCodec("UTF-8"); -+#endif - this->Implementation->Ui.currentFileLabel->setText(infoFile.fileName()); - while (!stream.atEnd()) - { -diff --git a/pqTreeViewEventPlayer.cxx b/pqTreeViewEventPlayer.cxx -index 02199925d018adc0df3a85548a7813aee7f21c84..d541a9cc684be11b0d30f1fdf321d872e8f9a78b 100644 ---- a/pqTreeViewEventPlayer.cxx -+++ b/pqTreeViewEventPlayer.cxx -@@ -63,8 +63,9 @@ bool pqTreeViewEventPlayer::playEvent( - return false; - } - -- QRegExp regExp0("^([\\d\\.]+),(\\d+),(\\d+)$"); -- if (command == "setTreeItemCheckState" && regExp0.indexIn(arguments) != -1) -+ QRegularExpression regExp0("^([\\d\\.]+),(\\d+),(\\d+)$"); -+ QRegularExpressionMatch match = regExp0.match(arguments); -+ if (command == "setTreeItemCheckState" && match.hasMatch()) - { - // legacy command recorded from tree widgets. - QTreeWidget* treeWidget = qobject_cast(object); -@@ -72,11 +73,14 @@ bool pqTreeViewEventPlayer::playEvent( - { - return false; - } -- QString str_index = regExp0.cap(1); -- int column = regExp0.cap(2).toInt(); -- int check_state = regExp0.cap(3).toInt(); -- -+ QString str_index = match.captured(1); -+ int column = match.captured(2).toInt(); -+ int check_state = match.captured(3).toInt(); -+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) -+ QStringList indices = str_index.split(".", Qt::SkipEmptyParts); -+#else - QStringList indices = str_index.split(".", QString::SkipEmptyParts); -+#endif - QTreeWidgetItem* cur_item = NULL; - Q_FOREACH (QString cur_index, indices) - { diff --git a/ports/paraview/external_vtk.patch b/ports/paraview/external_vtk.patch deleted file mode 100644 index 20fa08f77f..0000000000 --- a/ports/paraview/external_vtk.patch +++ /dev/null @@ -1,148 +0,0 @@ -diff --git a/CMake/ParaViewOptions.cmake b/CMake/ParaViewOptions.cmake -index 70c771151..14df81490 100644 ---- a/CMake/ParaViewOptions.cmake -+++ b/CMake/ParaViewOptions.cmake -@@ -99,7 +99,7 @@ endif() - #======================================================================== - - # XXX(VTK): External VTK is not yet actually supported. --if (FALSE) -+if (TRUE) - option(PARAVIEW_USE_EXTERNAL_VTK "Use an external VTK." OFF) - mark_as_advanced(PARAVIEW_USE_EXTERNAL_VTK) - else () -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6ee167322..628745584 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -73,7 +73,13 @@ if (NOT CMAKE_INSTALL_LICENSEDIR) - endif () - - set(paraview_cmake_dir "${CMAKE_CURRENT_SOURCE_DIR}/CMake") --set(vtk_cmake_dir "${CMAKE_CURRENT_SOURCE_DIR}/VTK/CMake") -+if (PARAVIEW_USE_EXTERNAL_VTK) -+ find_package(VTK CONFIG REQUIRED) -+ get_filename_component(vtk_cmake_dir "${VTK_CONFIG}" DIRECTORY ) -+else() -+ set(vtk_cmake_dir "${CMAKE_CURRENT_SOURCE_DIR}/VTK/CMake") -+endif() -+ - if (NOT IS_DIRECTORY "${vtk_cmake_dir}") - message(FATAL_ERROR - "Failed to find the VTK CMake directory. Did you forget to initialize the " -@@ -242,9 +246,7 @@ if (PARAVIEW_USE_FORTRAN) - enable_language(Fortran OPTIONAL) - endif () - --if (PARAVIEW_USE_EXTERNAL_VTK) -- find_package(VTK REQUIRED) --else () -+if (NOT PARAVIEW_USE_EXTERNAL_VTK) - list(APPEND CMAKE_MODULE_PATH - "${CMAKE_CURRENT_SOURCE_DIR}/VTK/CMake") - include(vtkCMakeBackports) -@@ -423,9 +425,67 @@ endif () - - if (PARAVIEW_USE_EXTERNAL_VTK) - if (paraview_required_modules OR paraview_unrecognized_modules) -- message(FATAL_ERROR -- "The following modules were requested or required, but not found: " -- "${paraview_required_modules};${paraview_unrecognized_modules}.") -+ foreach(mod ${paraview_required_modules}) -+ if(NOT TARGET ${mod}) -+ list(APPEND modules_notarget ${mod}) -+ endif() -+ if(${mod} MATCHES "VTK::") # For better debugging -+ list(APPEND vtk_modules ${mod}) -+ endif() -+ endforeach() -+ foreach(mod ${paraview_unrecognized_modules}) -+ if(NOT TARGET ${mod}) -+ list(FIND paraview_rejected_modules ${mod} _found_mod) -+ if(_found_mod GREATER_EQUAL 0) -+ list(APPEND _to_remove ${mod}) -+ endif() -+ else() -+ list(APPEND _to_remove ${mod}) -+ #list(APPEND vtk_modules ${mod}) #probably do not need to add unrecognized_modules to the wrapper -+ endif() -+ endforeach() -+ list(REMOVE_ITEM paraview_unrecognized_modules ${_to_remove}) -+ message(STATUS "UNRECOGNIZED:${paraview_unrecognized_modules}") -+ message(STATUS "REJECTED MODULES: ${paraview_rejected_modules}") -+ message(STATUS "UNRECOGNIZED WITHOUT REJECTED AND KNOWN TARGETS: ${paraview_unrecognized_modules}") -+ message(STATUS "ALL PROVIDED MODULES: ${paraview_modules}") -+ set(_unnecessary_moduls ${paraview_modules}) -+ list(REMOVE_ITEM _unnecessary_moduls ${paraview_required_modules}) -+ if(modules_notarget) -+ message(FATAL_ERROR -+ "The following modules were requested or required, but not found: " -+ "${modules_notarget}") -+ endif() -+ list(REMOVE_DUPLICATES vtk_modules) -+ macro(search_dependent_targets) -+ set(vtk_mod_dep_list) -+ foreach(vtk_targ ${ARGN}) -+ get_target_property(vtk_mod_dep ${vtk_targ} "INTERFACE_vtk_module_depends") -+ if(vtk_mod_dep) -+ list(APPEND vtk_mod_dep_list ${vtk_mod_dep}) -+ endif() -+ get_target_property(vtk_mod_pdep ${vtk_targ} "INTERFACE_vtk_module_private_depends") -+ if(vtk_mod_pdep) -+ list(APPEND vtk_mod_dep_list ${vtk_mod_pdep}) -+ endif() -+ get_target_property(vtk_mod_odep ${vtk_targ} "INTERFACE_vtk_module_opional_depends") -+ if(vtk_mod_odep) -+ list(APPEND vtk_mod_dep_list ${vtk_mod_odep}) -+ endif() -+ if(vtk_mod_dep_list) -+ message(STATUS "Target ${vtk_targ} depends on ${vtk_mod_dep_list}") -+ list(REMOVE_ITEM vtk_mod_dep_list ${vtk_modules}) -+ if(vtk_mod_dep_list) -+ message(STATUS "Newly discovered modules: ${vtk_mod_dep_list}") -+ list(APPEND vtk_modules ${vtk_mod_dep_list}) -+ search_dependent_targets(${vtk_mod_dep_list}) -+ else() -+ message(STATUS "No new modules discovered!") -+ endif() -+ endif() -+ endforeach() -+ endmacro() -+ search_dependent_targets(${vtk_modules}) - endif () - - if (PARAVIEW_USE_PYTHON) -@@ -508,7 +574,7 @@ else () - endif() - - # Set up these variables now so that modules may acess them -- if (NOT PARAVIEW_USE_EXTERNAL_VTK AND PARAVIEW_INSTALL_DEVELOPMENT_FILES) -+ if (PARAVIEW_INSTALL_DEVELOPMENT_FILES) - set(vtk_cmake_dir - "${CMAKE_CURRENT_SOURCE_DIR}/VTK/CMake") - set(vtk_cmake_destination -@@ -642,6 +708,9 @@ set(_paraview_add_tests_default_data_directory - set(_paraview_add_tests_default_test_data_target - "ParaViewData") - -+list(REMOVE_DUPLICATES vtk_modules) # Missed this somewhere -+list(REMOVE_DUPLICATES paraview_modules) # probably not needed -+ - vtk_module_build( - MODULES ${paraview_modules} - KITS ${paraview_kits} -@@ -703,9 +772,11 @@ if (PARAVIEW_ENABLE_CATALYST) - endif () - - include(vtkModuleJson) --vtk_module_json( -- MODULES ${vtk_modules} -- OUTPUT "vtk-modules.json") -+if(NOT PARAVIEW_USE_EXTERNAL_VTK) -+ vtk_module_json( -+ MODULES ${vtk_modules} -+ OUTPUT "vtk-modules.json") -+endif() - vtk_module_json( - MODULES ${paraview_modules} - OUTPUT "paraview-modules.json") diff --git a/ports/paraview/fix-build.patch b/ports/paraview/fix-build.patch new file mode 100644 index 0000000000..d02a94884b --- /dev/null +++ b/ports/paraview/fix-build.patch @@ -0,0 +1,45 @@ +diff --git a/CMake/vtkModuleWrapClientServer.cmake b/CMake/vtkModuleWrapClientServer.cmake +index cba0380cd9..9c8bbc5084 100644 +--- a/CMake/vtkModuleWrapClientServer.cmake ++++ b/CMake/vtkModuleWrapClientServer.cmake +@@ -72,8 +72,8 @@ function (_vtk_module_wrap_client_server_sources module sources classes) + "guarantee intended behavior.") + endif () + endif () +- file(GENERATE OUTPUT "compile_definitions_${_vtk_client_server_target_name}" CONTENT "${_vtk_client_server_genex_compile_definitions_all}") +- file(GENERATE OUTPUT "include_directories_${_vtk_client_server_target_name}" CONTENT "${_vtk_client_server_genex_include_directories_all}") ++ file(GENERATE OUTPUT "compile_definitions_${_vtk_client_server_library_name}" CONTENT "${_vtk_client_server_genex_compile_definitions_all}") ++ file(GENERATE OUTPUT "include_directories_${_vtk_client_server_library_name}" CONTENT "${_vtk_client_server_genex_include_directories_all}") + file(GENERATE + OUTPUT "${_vtk_client_server_args_file}" + CONTENT "$<$:\n-D\'$\'>\n +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1be00fb71a..c47cf20d55 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -68,7 +68,7 @@ if (PARAVIEW_USE_EXTERNAL_VTK) + "External VTK not found but ParaView requires VTK to function") + endif () + if (NOT PARAVIEW_BUILD_SHARED_LIBS) +- message(FATAL_ERROR ++ message(WARNING + "Static build with external VTK does not currently work.") + endif() + get_filename_component(vtk_cmake_dir "${VTK_CONFIG}" DIRECTORY) +diff --git a/Utilities/PythonInterpreterPath/vtkPVPythonInterpreterPath.cxx b/Utilities/PythonInterpreterPath/vtkPVPythonInterpreterPath.cxx +index 06e517964b..fbf9f5c2df 100644 +--- a/Utilities/PythonInterpreterPath/vtkPVPythonInterpreterPath.cxx ++++ b/Utilities/PythonInterpreterPath/vtkPVPythonInterpreterPath.cxx +@@ -13,8 +13,9 @@ extern "C" + void vtkPVInitializePythonModules(); + void VTKUTILITIESPYTHONINTERPRETERPATH_EXPORT vtkPVPythonInterpreterPath() + { +- std::string libraryPath = vtkGetLibraryPathForSymbol(vtkPVInitializePythonModules); +- vtkPythonInterpreter::SetUserPythonPath( +- libraryPath.c_str(), "paraview/__init__.py" /*landmark*/); ++ // Ignore this for now. Requires a slightly newer VTK version than PV 5.12 uses. ++ //std::string libraryPath = vtkGetLibraryPathForSymbol(vtkPVInitializePythonModules); ++ //vtkPythonInterpreter::SetUserPythonPath( ++ // libraryPath.c_str(), "paraview/__init__.py" /*landmark*/); + } + } diff --git a/ports/paraview/fix-configure.patch b/ports/paraview/fix-configure.patch new file mode 100644 index 0000000000..726b57d396 --- /dev/null +++ b/ports/paraview/fix-configure.patch @@ -0,0 +1,35 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1b9fd80..94ad133 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -557,7 +557,16 @@ if (PARAVIEW_USE_EXTERNAL_VTK) + endforeach() + endmacro() + search_dependent_targets(${vtk_modules}) +- find_package(VTK CONFIG REQUIRED COMPONENTS "${vtk_components}") ++ ++ if (PARAVIEW_USE_PYTHON) ++ get_target_property(vtk_python_modules VTK::vtkpythonmodules "INTERFACE_LINK_LIBRARIES") ++ list(TRANSFORM vtk_python_modules REPLACE "Python$" "" OUTPUT_VARIABLE vtk_modules_wrapped) ++ list(TRANSFORM vtk_modules_wrapped REPLACE "^VTK::vtk" "" OUTPUT_VARIABLE vtk_components_wrapped) ++ list(APPEND vtk_components ${vtk_components_wrapped}) ++ list(REMOVE_DUPLICATES vtk_components) ++ endif() ++ ++ find_package(VTK CONFIG REQUIRED COMPONENTS "${vtk_components}") + if (PARAVIEW_USE_PYTHON) + find_package(Python3 3.3 QUIET REQUIRED COMPONENTS Interpreter) + set(PYTHON_VERSION_MAJOR "${Python3_VERSION_MAJOR}") +diff --git a/Qt/Python/vtk.module b/Qt/Python/vtk.module +index f82f076..86dbafd 100644 +--- a/Qt/Python/vtk.module ++++ b/Qt/Python/vtk.module +@@ -12,7 +12,7 @@ GROUPS + PARAVIEW_CANONICAL + DEPENDS + ParaView::pqCore +- ParaView::PythonInitializer ++ #ParaView::PythonInitializer <- Creates a cycle + VTK::PythonInterpreter + VTK::WrappingPythonCore + TEST_LABELS diff --git a/ports/paraview/portfile.cmake b/ports/paraview/portfile.cmake index 737b865855..1d80486c85 100644 --- a/ports/paraview/portfile.cmake +++ b/ports/paraview/portfile.cmake @@ -1,4 +1,4 @@ -set(VERSION_MAJOR_MINOR 5.11) +set(VERSION_MAJOR_MINOR 5.12) set(plat_feat "") if(VCPKG_TARGET_IS_LINUX) @@ -18,18 +18,46 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES ${plat_feat} ) +vcpkg_download_distfile( + external_vtk_patch + URLS https://gitlab.kitware.com/paraview/paraview/-/merge_requests/6375.diff?full_index=1 + FILENAME paraview_external_vtk_pr.diff + SHA512 c7760599239334817e9cad33ab7019c2dd0ce6740891e10ec15e1d63605ad73095fd7d48aed5ca8d002d25db356a7a5cf2a37188f0b43a7a9fa4c339e8f42adb +) + +set(ext_vtk_patch_copy "${CURRENT_BUILDTREES_DIR}/paraview_external_vtk_pr.diff") +file(COPY "${external_vtk_patch}" DESTINATION "${CURRENT_BUILDTREES_DIR}" ) + +# Remove stuff which cannot be patched since it does not exist +vcpkg_replace_string("${ext_vtk_patch_copy}" +[[ +diff --git a/.gitlab/ci/sccache.sh b/.gitlab/ci/sccache.sh +index f1897d6f719c3b61b6d4fa317966c007dab2fc23..e88d7c89198696832e5645bfb0e758fd5d92e6af 100755 +--- a/.gitlab/ci/sccache.sh ++++ b/.gitlab/ci/sccache.sh +@@ -37,6 +37,6 @@ $shatool --check sccache.sha256sum + mv "$filename" sccache + chmod +x sccache + +-mkdir shortcuts ++mkdir -p shortcuts + cp ./sccache shortcuts/gcc + cp ./sccache shortcuts/g++ +]] +"" +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Kitware/ParaView - REF 91aaf338c62f77fccd7d197dea05e7a68035ab25 # v5.11.0 - SHA512 ddd72b127462a37dba220808925ab1991b3072ddd3f39ba7f26d260bd5abbaa6bd38a0c0181141f461df60dd718ec85df8c0faffff8e53a6cd1737b784565f4b + REF b701926ba2bd753eff36aec56e36ad4d5ac3168b # v5.12.0 + SHA512 9fbebfa11b60c81deec0df7508a0433a1bced620367477e15314e232d50ba6a6196074d3d701434652cb9a2e0c946159f44e8e16682aa6326a89ebd6caa1f5d9 HEAD_REF master PATCHES - external_vtk.patch - python_include.patch - python_wrapper.patch + ${ext_vtk_patch_copy} add-tools-option.patch - qt6-all.patch + fix-build.patch + fix-configure.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -44,8 +72,8 @@ vcpkg_from_gitlab( OUT_SOURCE_PATH VISITIT_SOURCE_PATH GITLAB_URL https://gitlab.kitware.com/ REPO paraview/visitbridge - REF df098f4148a96d62c388861c1d476039e02224ae - SHA512 002c2c934ef7e64c89b1567f406db1ebb90532817062e7016c248ba8ae85a88f1a35bc3963a9577ec08ba742a0e7fb91022c29aaaa0bddf0a1d585074341733e + REF 92ad478e3d6b18b111ef45ab76d6dad5d3530381 + SHA512 c4893929b99419a365e90450f9c6d8a72f30f88aadbfe5c7d23ec4a46e9cf301e0b9c31cd602d1ab717ffb6744ae45abe41cb0e9c1f02b83e4468c702e8d023d PATCHES ${VisItPatches} ) @@ -56,9 +84,8 @@ vcpkg_from_gitlab( OUT_SOURCE_PATH QTTESTING_SOURCE_PATH GITLAB_URL https://gitlab.kitware.com/ REPO paraview/qttesting - REF 08d96e9277bc4c26804fd77ce1b4fa5c791605ae # https://gitlab.kitware.com/paraview/qttesting/-/merge_requests/53 for Qt6 - SHA512 cb4acdfe1206bd8bae4f70185c8ca1ce555cf983a1d1e97293dac544ab13b039638bfe0d1e448f9589db92b6ed23b9b940157e72d9ec9e3994ea9858ab1722ec - PATCHES 53.diff + REF 9d4346485cfce79ad448f7e5656b2525b255b2ca # https://gitlab.kitware.com/paraview/qttesting/-/merge_requests/53 for Qt6 + SHA512 7561cd66e1a12053b7a81ab7a80ad2163922995317a503761521151668a905602fb1bb23c963e18d2739d17aa4187ccf1b4bd1010b0494aab6d4fc004e0e9760 ) vcpkg_from_gitlab( @@ -76,21 +103,32 @@ file(COPY "${ICET_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/ThirdParty/IceT/vtk if("python" IN_LIST FEATURES) set(python_ver "") if(NOT VCPKG_TARGET_IS_WINDOWS) - file(GLOB _py3_include_path "${CURRENT_HOST_INSTALLED_DIR}/include/python3*") + file(GLOB _py3_include_path "${CURRENT_INSTALLED_DIR}/include/python3*") string(REGEX MATCH "python3\\.([0-9]+)" _python_version_tmp ${_py3_include_path}) set(PYTHON_VERSION_MINOR "${CMAKE_MATCH_1}") set(python_ver "3.${PYTHON_VERSION_MINOR}") endif() list(APPEND ADDITIONAL_OPTIONS -DPython3_FIND_REGISTRY=NEVER - "-DPython3_EXECUTABLE:PATH=${CURRENT_HOST_INSTALLED_DIR}/tools/python3/python${python_ver}${VCPKG_EXECUTABLE_SUFFIX}" + "-DPython3_EXECUTABLE:PATH=${CURRENT_INSTALLED_DIR}/tools/python3/python${python_ver}${VCPKG_EXECUTABLE_SUFFIX}" + -DPARAVIEW_PYTHON_SITE_PACKAGES_SUFFIX=${PYTHON3_SITE} + -DVTK_MODULE_ENABLE_ParaView_PythonCatalyst:STRING=YES ) - #VTK_PYTHON_SITE_PACKAGES_SUFFIX should be set to the install dir of the site-packages +endif() + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PARAVIEW_BUILD_SHARED_LIBS) + +if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") + # Hitting pdb size limits when building debug paraview so increase it + string(APPEND VCPKG_LINKER_FLAGS_DEBUG " /PDBPAGESIZE:8192") endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS ${FEATURE_OPTIONS} + OPTIONS + ${FEATURE_OPTIONS} + -DPARAVIEW_USE_FORTRAN=OFF + -DPARAVIEW_BUILD_SHARED_LIBS=${PARAVIEW_BUILD_SHARED_LIBS} -DPARAVIEW_PLUGIN_DISABLE_XML_DOCUMENTATION:BOOL=ON -DPARAVIEW_BUILD_WITH_EXTERNAL:BOOL=ON -DPARAVIEW_USE_EXTERNAL_VTK:BOOL=ON @@ -107,7 +145,6 @@ vcpkg_cmake_configure( ${ADDITIONAL_OPTIONS} #-DPARAVIEW_ENABLE_FFMPEG:BOOL=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_Graphviz=ON ) if(CMAKE_HOST_UNIX) # ParaView runs Qt tools so LD_LIBRARY_PATH must be set correctly for them to find *.so files @@ -169,9 +206,8 @@ foreach(tool ${TOOLS}) endforeach() vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) -# # Handle copyright -file(INSTALL "${SOURCE_PATH}/Copyright.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME Copyright.txt) # Which one is the correct one? -file(INSTALL "${SOURCE_PATH}/License_v1.2.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +# Handle copyright +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/Copyright.txt") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") macro(move_bin_to_lib name) @@ -200,7 +236,7 @@ endif() file(GLOB cmake_files "${CURRENT_PACKAGES_DIR}/share/${PORT}/*.cmake") foreach(file IN LISTS cmake_files) - vcpkg_replace_string("${file}" "pv5.11d.exe" "pv5.11.exe") + vcpkg_replace_string("${file}" "pv${VERSION_MAJOR_MINOR}d.exe" "pv${VERSION_MAJOR_MINOR}.exe") endforeach() # The plugins also work without these files diff --git a/ports/paraview/python_include.patch b/ports/paraview/python_include.patch deleted file mode 100644 index 42ada661bb..0000000000 --- a/ports/paraview/python_include.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMake/ParaViewOptions.cmake b/CMake/ParaViewOptions.cmake -index 0ecb928e9..5b5459a37 100644 ---- a/CMake/ParaViewOptions.cmake -+++ b/CMake/ParaViewOptions.cmake -@@ -136,7 +136,7 @@ option(PARAVIEW_ENABLE_RAYTRACING "Build ParaView with OSPray and/or OptiX ray-t - - set(paraview_web_default ON) - if (PARAVIEW_USE_PYTHON AND WIN32) -- include("${CMAKE_CURRENT_SOURCE_DIR}/VTK/CMake/FindPythonModules.cmake") -+ include(FindPythonModules) - find_python_module(win32api have_pywin32) - set(paraview_web_default "${have_pywin32}") - endif () diff --git a/ports/paraview/python_wrapper.patch b/ports/paraview/python_wrapper.patch deleted file mode 100644 index 33a70f069a..0000000000 --- a/ports/paraview/python_wrapper.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/CMake/vtkModuleWrapClientServer.cmake b/CMake/vtkModuleWrapClientServer.cmake -index 3804a24e2..91fdd593a 100644 ---- a/CMake/vtkModuleWrapClientServer.cmake -+++ b/CMake/vtkModuleWrapClientServer.cmake -@@ -37,10 +37,13 @@ function (_vtk_module_wrap_client_server_sources module sources classes) - "$") - set(_vtk_client_server_genex_include_directories - "$") -+ set(_vtk_client_server_genex_interface_include_directories -+ "$") - file(GENERATE - OUTPUT "${_vtk_client_server_args_file}" - CONTENT "$<$:\n-D\'$\'>\n --$<$:\n-I\'$\'>\n") -+ $<$:\n-I\'$\'>\n -+ $<$:\n-I\'$\'>\n") - - _vtk_module_get_module_property("${module}" - PROPERTY "hierarchy" diff --git a/ports/paraview/qt6-all.patch b/ports/paraview/qt6-all.patch deleted file mode 100644 index 601ca04a04..0000000000 --- a/ports/paraview/qt6-all.patch +++ /dev/null @@ -1,2585 +0,0 @@ -diff --git a/CMake/ParaViewClient.cmake b/CMake/ParaViewClient.cmake -index be11fe5ae..074823325 100644 ---- a/CMake/ParaViewClient.cmake -+++ b/CMake/ParaViewClient.cmake -@@ -285,7 +285,7 @@ IDI_ICON1 ICON \"${_paraview_client_APPLICATION_ICON}\"\n") - endif () - - include("${_ParaViewClient_cmake_dir}/paraview-find-package-helpers.cmake" OPTIONAL) -- find_package(Qt5 REQUIRED QUIET COMPONENTS Core Widgets) -+ find_package(Qt${VTK_QT_VERSION} REQUIRED QUIET COMPONENTS Core Widgets) - - # CMake 3.13 started using Qt5's version variables to detect what version - # of Qt's tools to run for autorcc. However, they are looked up using the -@@ -294,8 +294,8 @@ IDI_ICON1 ICON \"${_paraview_client_APPLICATION_ICON}\"\n") - - # Fix for 3.13.0–3.13.3. Does not work if `paraview_client_add` is called - # from another function. -- set(Qt5Core_VERSION_MAJOR "${Qt5Core_VERSION_MAJOR}" PARENT_SCOPE) -- set(Qt5Core_VERSION_MINOR "${Qt5Core_VERSION_MINOR}" PARENT_SCOPE) -+ set(Qt${VTK_QT_VERSION}Core_VERSION_MAJOR "${Qt${VTK_QT_VERSION}Core_VERSION_MAJOR}" PARENT_SCOPE) -+ set(Qt${VTK_QT_VERSION}Core_VERSION_MINOR "${Qt${VTK_QT_VERSION}Core_VERSION_MINOR}" PARENT_SCOPE) - # Fix for 3.13.4+. - set_property(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" - PROPERTY -@@ -375,12 +375,12 @@ IDI_ICON1 ICON \"${_paraview_client_APPLICATION_ICON}\"\n") - target_link_libraries("${_paraview_client_NAME}" - PRIVATE - ParaView::pqApplicationComponents -- Qt5::Widgets -+ Qt${VTK_QT_VERSION}::Widgets - VTK::vtksys) - if (PARAVIEW_USE_QTWEBENGINE) -- find_package(Qt5 REQUIRED QUIET COMPONENTS WebEngineWidgets) -+ find_package(Qt${VTK_QT_VERSION} REQUIRED QUIET COMPONENTS WebEngineWidgets) - target_link_libraries("${_paraview_client_NAME}" -- PRIVATE Qt5::WebEngineWidgets) -+ PRIVATE Qt${VTK_QT_VERSION}::WebEngineWidgets) - endif () - - set(_paraview_client_export) -@@ -517,7 +517,7 @@ function (paraview_client_documentation) - endif () - - include("${_ParaViewClient_cmake_dir}/paraview-find-package-helpers.cmake" OPTIONAL) -- find_program(qt_xmlpatterns_executable -+ find_program(qt_xmlpatterns_executable # this only exists in qt5 and the portfile deactivates xml docs - NAMES xmlpatterns-qt5 xmlpatterns - HINTS "${Qt5_DIR}/../../../bin" - "${Qt5_DIR}/../../../libexec/qt5/bin" -@@ -802,7 +802,7 @@ function (paraview_client_generate_help) - endif () - - include("${_ParaViewClient_cmake_dir}/paraview-find-package-helpers.cmake" OPTIONAL) -- find_package(Qt5 QUIET REQUIRED COMPONENTS Help) -+ find_package(Qt${VTK_QT_VERSION} QUIET REQUIRED COMPONENTS Help) - - set(_paraview_client_help_copy_sources) - set(_paraview_client_help_copied_sources) -@@ -843,7 +843,7 @@ function (paraview_client_generate_help) - -P "${_ParaViewClient_script_file}" - VERBATIM - COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} -- $ -+ $ - "${_paraview_client_help_qhp}" - -s - -o "${_paraview_client_help_output}" -diff --git a/CMake/ParaViewPlugin.cmake b/CMake/ParaViewPlugin.cmake -index f349f2cbf..13708a004 100644 ---- a/CMake/ParaViewPlugin.cmake -+++ b/CMake/ParaViewPlugin.cmake -@@ -1331,16 +1331,16 @@ function (paraview_add_plugin name) - list(APPEND _paraview_add_plugin_qt_extra_components - Widgets) - list(APPEND _paraview_add_plugin_required_libraries -- Qt5::Widgets) -+ Qt${VTK_QT_VERSION}::Widgets) - list(APPEND _paraview_add_plugin_ui_sources - ${_paraview_add_plugin_UI_FILES}) - endif () - - if (_paraview_add_plugin_with_ui OR _paraview_add_plugin_with_resources) - include("${_ParaViewPlugin_cmake_dir}/paraview-find-package-helpers.cmake" OPTIONAL) -- find_package(Qt5 QUIET REQUIRED COMPONENTS Core ${_paraview_add_plugin_qt_extra_components}) -+ find_package(Qt${VTK_QT_VERSION} QUIET REQUIRED COMPONENTS Core ${_paraview_add_plugin_qt_extra_components}) - list(APPEND _paraview_add_plugin_required_libraries -- Qt5::Core) -+ Qt${VTK_QT_VERSION}::Core) - if (_paraview_add_plugin_with_ui) - list(APPEND _paraview_add_plugin_required_libraries - ParaView::pqCore) -@@ -1354,15 +1354,15 @@ function (paraview_add_plugin name) - - # Fix for 3.13.0–3.13.3. Does not work if `paraview_add_plugin` is called - # from another function. -- set(Qt5Core_VERSION_MAJOR "${Qt5Core_VERSION_MAJOR}" PARENT_SCOPE) -- set(Qt5Core_VERSION_MINOR "${Qt5Core_VERSION_MINOR}" PARENT_SCOPE) -+ set(Qt${VTK_QT_VERSION}Core_VERSION_MAJOR "${Qt${VTK_QT_VERSION}Core_VERSION_MAJOR}" PARENT_SCOPE) -+ set(Qt${VTK_QT_VERSION}Core_VERSION_MINOR "${Qt${VTK_QT_VERSION}Core_VERSION_MINOR}" PARENT_SCOPE) - # Fix for 3.13.4+. - set_property(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" - PROPERTY -- Qt5Core_VERSION_MAJOR "${Qt5Core_VERSION_MAJOR}") -+ Qt${VTK_QT_VERSION}Core_VERSION_MAJOR "${Qt${VTK_QT_VERSION}Core_VERSION_MAJOR}") - set_property(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" - PROPERTY -- Qt5Core_VERSION_MINOR "${Qt5Core_VERSION_MAJOR}") -+ Qt5Core_VERSION_MINOR "${Qt${VTK_QT_VERSION}Core_VERSION_MAJOR}") - endif () - - set(_paraview_add_plugin_with_python 0) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 37bd1965c..ef7e7d1eb 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -626,7 +626,7 @@ else () - - set(VTK_BUILD_QT_DESIGNER_PLUGIN OFF) - set(VTK_INSTALL_PYTHON_EXES OFF) -- set(VTK_QT_VERSION 5) -+ set(VTK_QT_VERSION 6) - - cmake_dependent_option(VTK_NO_PYTHON_THREADS "Disable Python Threads support" ON - "PARAVIEW_USE_PYTHON" OFF) -diff --git a/Clients/ParaView/CMakeLists.txt b/Clients/ParaView/CMakeLists.txt -index f51fe395b..bc132c095 100644 ---- a/Clients/ParaView/CMakeLists.txt -+++ b/Clients/ParaView/CMakeLists.txt -@@ -33,7 +33,7 @@ set(sources - ParaViewMainWindow.h - ParaViewMainWindow.ui) - --find_package(Qt5 REQUIRED QUIET COMPONENTS Core Widgets) -+find_package(Qt${VTK_QT_VERSION} REQUIRED QUIET COMPONENTS Core Widgets) - - if (APPLE) - # Enable high resolution when using Qt5 -@@ -76,13 +76,13 @@ paraview_client_add( - PLUGINS_TARGETS ParaView::paraview_plugins - APPLICATION_XMLS ${xmls}) - --find_package(Qt5 REQUIRED QUIET COMPONENTS Widgets) -+find_package(Qt${VTK_QT_VERSION} REQUIRED QUIET COMPONENTS Widgets) - - target_link_libraries(paraview - PRIVATE - ParaView::RemotingSettings -- Qt5::Core -- Qt5::Widgets) -+ Qt${VTK_QT_VERSION}::Core -+ Qt${VTK_QT_VERSION}::Widgets) - - target_compile_definitions(paraview - PRIVATE -diff --git a/Clients/ParaView/Documentation/CMakeLists.txt b/Clients/ParaView/Documentation/CMakeLists.txt -index c8d550f49..c4551367d 100644 ---- a/Clients/ParaView/Documentation/CMakeLists.txt -+++ b/Clients/ParaView/Documentation/CMakeLists.txt -@@ -43,7 +43,7 @@ paraview_client_generate_help( - - set(CMAKE_AUTORCC 1) - --find_package(Qt5 REQUIRED QUIET COMPONENTS Core) -+find_package(Qt${VTK_QT_VERSION} REQUIRED QUIET COMPONENTS Core) - - add_library(vtkParaViewDocumentation STATIC - ParaViewDocumentationInitializer.cxx -@@ -54,7 +54,7 @@ target_include_directories(vtkParaViewDocumentation - "$") - target_link_libraries(vtkParaViewDocumentation - PRIVATE -- Qt5::Core) -+ Qt${VTK_QT_VERSION}::Core) - - install( - FILES "${paraview_qch}" -diff --git a/Examples/CustomApplications/Demo0/CMakeLists.txt b/Examples/CustomApplications/Demo0/CMakeLists.txt -index 9c276bcc6..5a2682577 100644 ---- a/Examples/CustomApplications/Demo0/CMakeLists.txt -+++ b/Examples/CustomApplications/Demo0/CMakeLists.txt -@@ -16,10 +16,10 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}" - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}") - set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}") - --find_package(Qt5 REQUIRED COMPONENTS Widgets) -+find_package(Qt${VTK_QT_VERSION} REQUIRED COMPONENTS Widgets) - - add_executable(DemoApp0 DemoApp0.cxx) - target_link_libraries(DemoApp0 - PRIVATE - ParaView::pqCore -- Qt5::Widgets) -+ Qt${VTK_QT_VERSION}::Widgets) -diff --git a/Examples/CustomApplications/Demo1/CMakeLists.txt b/Examples/CustomApplications/Demo1/CMakeLists.txt -index 4efa3df36..6579a769d 100644 ---- a/Examples/CustomApplications/Demo1/CMakeLists.txt -+++ b/Examples/CustomApplications/Demo1/CMakeLists.txt -@@ -16,7 +16,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}" - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}") - set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}") - --find_package(Qt5 REQUIRED COMPONENTS Widgets) -+find_package(Qt${VTK_QT_VERSION} REQUIRED COMPONENTS Widgets) - - set(CMAKE_AUTOMOC 1) - set(CMAKE_AUTOUIC 1) -@@ -30,4 +30,4 @@ add_executable(DemoApp1 DemoApp1.cxx ${sources}) - target_link_libraries(DemoApp1 - PRIVATE - ParaView::pqApplicationComponents -- Qt5::Widgets) -+ Qt${VTK_QT_VERSION}::Widgets) -diff --git a/Examples/CustomApplications/Demo2/CMakeLists.txt b/Examples/CustomApplications/Demo2/CMakeLists.txt -index ccb4d43b5..3d4ca862a 100644 ---- a/Examples/CustomApplications/Demo2/CMakeLists.txt -+++ b/Examples/CustomApplications/Demo2/CMakeLists.txt -@@ -16,7 +16,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}" - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}") - set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}") - --find_package(Qt5 REQUIRED COMPONENTS Widgets) -+find_package(Qt${VTK_QT_VERSION} REQUIRED COMPONENTS Widgets) - - set(CMAKE_AUTOMOC 1) - set(CMAKE_AUTOUIC 1) -@@ -30,6 +30,6 @@ add_executable(DemoApp2 DemoApp2.cxx ${sources}) - target_link_libraries(DemoApp2 - PRIVATE - ParaView::pqApplicationComponents -- Qt5::Widgets) -+ Qt${VTK_QT_VERSION}::Widgets) - - configure_file(ParaViewFilters.xml ${CMAKE_BINARY_DIR} COPYONLY) -diff --git a/Examples/Plugins/DockWidget/Plugin/CMakeLists.txt b/Examples/Plugins/DockWidget/Plugin/CMakeLists.txt -index d4c87afe1..96b5540ba 100644 ---- a/Examples/Plugins/DockWidget/Plugin/CMakeLists.txt -+++ b/Examples/Plugins/DockWidget/Plugin/CMakeLists.txt -@@ -1,4 +1,4 @@ --find_package(Qt5 REQUIRED COMPONENTS Widgets) -+find_package(Qt${VTK_QT_VERSION} REQUIRED COMPONENTS Widgets) - - set(interfaces) - set(sources -@@ -29,4 +29,4 @@ paraview_add_plugin(ExampleDockPanel - - target_link_libraries(ExampleDockPanel - PRIVATE -- Qt5::Widgets) -+ Qt${VTK_QT_VERSION}::Widgets) -diff --git a/Examples/Plugins/RepresentationBehavior/CMakeLists.txt b/Examples/Plugins/RepresentationBehavior/CMakeLists.txt -index b4d65f22a..0dfee987e 100644 ---- a/Examples/Plugins/RepresentationBehavior/CMakeLists.txt -+++ b/Examples/Plugins/RepresentationBehavior/CMakeLists.txt -@@ -17,7 +17,7 @@ if(NOT DEFINED CMAKE_MACOSX_RPATH) - set(CMAKE_MACOSX_RPATH 0) - endif() - --QT5_WRAP_CPP(MOC_SRCS -+QT${VTK_QT_VERSION}_WRAP_CPP(MOC_SRCS - pqRepresentationBehaviorStarter.h - pqSurfaceRepresentationBehavior.h) - -diff --git a/Plugins/CAVEInteraction/CMakeLists.txt b/Plugins/CAVEInteraction/CMakeLists.txt -index de862c006..ac214e9c4 100644 ---- a/Plugins/CAVEInteraction/CMakeLists.txt -+++ b/Plugins/CAVEInteraction/CMakeLists.txt -@@ -1,4 +1,4 @@ --find_package(Qt5 QUIET REQUIRED COMPONENTS Network) -+find_package(Qt${VTK_QT_VERSION} QUIET REQUIRED COMPONENTS Network) - - list(INSERT CMAKE_MODULE_PATH 0 - "${CMAKE_CURRENT_SOURCE_DIR}/cmake") -@@ -8,7 +8,7 @@ mark_as_advanced(PARAVIEW_PLUGIN_CAVEInteraction_USE_VRPN) - option(PARAVIEW_PLUGIN_CAVEInteraction_USE_VRUI "Build CAVEInteraction plugin with VRUI support" OFF) - mark_as_advanced(PARAVIEW_PLUGIN_CAVEInteraction_USE_VRUI) - --find_package(Qt5 REQUIRED COMPONENTS Network) -+find_package(Qt${VTK_QT_VERSION} REQUIRED COMPONENTS Network) - - # TODO: Should something be done with the files in samples/? - -@@ -132,7 +132,7 @@ target_link_libraries(CAVEInteraction - VTK::CommonMath - VTK::CommonTransforms - VTK::RenderingCore -- Qt5::Network) -+ Qt${VTK_QT_VERSION}::Network) - target_compile_definitions(CAVEInteraction PRIVATE QT_NO_KEYWORDS) - - if (PARAVIEW_PLUGIN_CAVEInteraction_USE_VRPN) -diff --git a/Plugins/LagrangianParticleTracker/pqIntegrationModelSeedHelperWidget.cxx b/Plugins/LagrangianParticleTracker/pqIntegrationModelSeedHelperWidget.cxx -index 1b5134345..3660a5867 100644 ---- a/Plugins/LagrangianParticleTracker/pqIntegrationModelSeedHelperWidget.cxx -+++ b/Plugins/LagrangianParticleTracker/pqIntegrationModelSeedHelperWidget.cxx -@@ -119,7 +119,7 @@ void pqIntegrationModelSeedHelperWidget::resetSeedWidget(bool force) - - // Create main layout - QGridLayout* gridLayout = new QGridLayout(this); -- gridLayout->setMargin(pqPropertiesPanel::suggestedMargin()); -+ gridLayout->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - gridLayout->setHorizontalSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); - gridLayout->setVerticalSpacing(pqPropertiesPanel::suggestedVerticalSpacing()); - gridLayout->setColumnStretch(0, 0); -@@ -143,7 +143,7 @@ void pqIntegrationModelSeedHelperWidget::resetSeedWidget(bool force) - - // Add a layout in each - QGridLayout* gbLayout = new QGridLayout(gb); -- gbLayout->setMargin(pqPropertiesPanel::suggestedMargin()); -+ gbLayout->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - gbLayout->setHorizontalSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); - gbLayout->setVerticalSpacing(pqPropertiesPanel::suggestedVerticalSpacing()); - gb->setLayout(gbLayout); -diff --git a/Plugins/PythonQtPlugin/CMakeLists.txt b/Plugins/PythonQtPlugin/CMakeLists.txt -index 928b48e14..c6e0d4c71 100644 ---- a/Plugins/PythonQtPlugin/CMakeLists.txt -+++ b/Plugins/PythonQtPlugin/CMakeLists.txt -@@ -1,4 +1,4 @@ --find_package(Qt5 QUIET REQUIRED COMPONENTS Widgets) -+find_package(Qt${VTK_QT_VERSION} QUIET REQUIRED COMPONENTS Widgets) - - list(INSERT CMAKE_MODULE_PATH 0 - "${CMAKE_CURRENT_SOURCE_DIR}/cmake") -diff --git a/Plugins/XRInterface/Plugin/CMakeLists.txt b/Plugins/XRInterface/Plugin/CMakeLists.txt -index b116e880c..4f1964d31 100644 ---- a/Plugins/XRInterface/Plugin/CMakeLists.txt -+++ b/Plugins/XRInterface/Plugin/CMakeLists.txt -@@ -1,4 +1,4 @@ --find_package(Qt5 REQUIRED COMPONENTS Widgets Network) -+find_package(Qt${VTK_QT_VERSION} REQUIRED COMPONENTS Widgets Network) - - set(required_modules "") - set(openxr_support FALSE) -diff --git a/Plugins/XRInterface/Plugin/Representations/CMakeLists.txt b/Plugins/XRInterface/Plugin/Representations/CMakeLists.txt -index bd45f6142..f8336705b 100644 ---- a/Plugins/XRInterface/Plugin/Representations/CMakeLists.txt -+++ b/Plugins/XRInterface/Plugin/Representations/CMakeLists.txt -@@ -6,13 +6,13 @@ set(sources) - set(xrInterfaceXMLs XRInterfaceRepresentations.xml) - - if (TARGET VTK::RenderingFFMPEGOpenGL2) -- find_package(Qt5 REQUIRED QUIET COMPONENTS Multimedia) -+ find_package(Qt${VTK_QT_VERSION} REQUIRED QUIET COMPONENTS Multimedia) - list(APPEND classes vtkSkyboxMovieRepresentation) - list(APPEND xrInterfaceXMLs XRInterfaceSkyboxMovieRepresentation.xml) - endif() - - if (PARAVIEW_USE_QTWEBENGINE) -- find_package(Qt5 REQUIRED QUIET COMPONENTS WebEngineWidgets Multimedia) -+ find_package(Qt${VTK_QT_VERSION} REQUIRED QUIET COMPONENTS WebEngineWidgets Multimedia) - list(APPEND sources vtkXRInterfaceWebView.ui) - list(APPEND classes - vtkXRInterfaceWebView -diff --git a/Qt/ApplicationComponents/CMakeLists.txt b/Qt/ApplicationComponents/CMakeLists.txt -index 6aa659fc6..3968b2951 100644 ---- a/Qt/ApplicationComponents/CMakeLists.txt -+++ b/Qt/ApplicationComponents/CMakeLists.txt -@@ -320,7 +320,7 @@ if (PARAVIEW_USE_QTHELP) - endif () - - vtk_module_find_package( -- PACKAGE Qt5 -+ PACKAGE Qt${VTK_QT_VERSION} - COMPONENTS ${qt_components}) - - source_group("Resources" FILES -@@ -339,12 +339,12 @@ vtk_module_add_module(ParaView::pqApplicationComponents - ${resource_files}) - vtk_module_link(ParaView::pqApplicationComponents - PRIVATE -- Qt5::Widgets -- Qt5::Svg -- Qt5::Network) -+ Qt${VTK_QT_VERSION}::Widgets -+ Qt${VTK_QT_VERSION}::Svg -+ Qt${VTK_QT_VERSION}::Network) - vtk_module_definitions(ParaView::pqApplicationComponents PRIVATE QT_NO_KEYWORDS) - if (PARAVIEW_USE_QTHELP) - vtk_module_link(ParaView::pqApplicationComponents - PRIVATE -- Qt5::Help) -+ Qt${VTK_QT_VERSION}::Help) - endif () -diff --git a/Qt/ApplicationComponents/pqBackgroundEditorWidget.cxx b/Qt/ApplicationComponents/pqBackgroundEditorWidget.cxx -index 1175a05ec..a2c1ced09 100644 ---- a/Qt/ApplicationComponents/pqBackgroundEditorWidget.cxx -+++ b/Qt/ApplicationComponents/pqBackgroundEditorWidget.cxx -@@ -83,12 +83,12 @@ public: - : PreviousType(SINGLE_COLOR_TYPE) - { - this->setupUi(self); -- this->mainLayout->setMargin(pqPropertiesPanel::suggestedMargin()); -+ this->mainLayout->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - this->mainLayout->setSpacing(pqPropertiesPanel::suggestedVerticalSpacing()); -- this->page1Layout->setMargin(pqPropertiesPanel::suggestedMargin()); -+ this->page1Layout->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - this->page1Layout->setHorizontalSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); - this->page1Layout->setVerticalSpacing(pqPropertiesPanel::suggestedVerticalSpacing()); -- this->page3Layout->setMargin(pqPropertiesPanel::suggestedMargin()); -+ this->page3Layout->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - this->page3Layout->setSpacing(pqPropertiesPanel::suggestedVerticalSpacing()); - } - }; -diff --git a/Qt/ApplicationComponents/pqCameraManipulatorWidget.cxx b/Qt/ApplicationComponents/pqCameraManipulatorWidget.cxx -index 7652f666a..26234257d 100644 ---- a/Qt/ApplicationComponents/pqCameraManipulatorWidget.cxx -+++ b/Qt/ApplicationComponents/pqCameraManipulatorWidget.cxx -@@ -120,7 +120,7 @@ pqCameraManipulatorWidget::pqCameraManipulatorWidget( - ui.setupUi(this); - ui.gridLayout->setVerticalSpacing(pqPropertiesPanel::suggestedVerticalSpacing()); - ui.gridLayout->setHorizontalSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); -- ui.gridLayout->setMargin(0); -+ ui.gridLayout->setContentsMargins(0,0,0,0); - - QPointer* boxes = this->Internals->Boxes; - boxes[0] = ui.comboBox_1; -diff --git a/Qt/ApplicationComponents/pqCheckableProperty.cxx b/Qt/ApplicationComponents/pqCheckableProperty.cxx -index 800897b28..496bf09d6 100644 ---- a/Qt/ApplicationComponents/pqCheckableProperty.cxx -+++ b/Qt/ApplicationComponents/pqCheckableProperty.cxx -@@ -75,7 +75,7 @@ pqCheckableProperty::pqCheckableProperty( - this->setChangeAvailableAsChangeFinished(true); - - auto* layoutLocal = new QHBoxLayout; -- layoutLocal->setMargin(pqPropertiesPanel::suggestedMargin()); -+ layoutLocal->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - layoutLocal->setSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); - this->setLayout(layoutLocal); - -diff --git a/Qt/ApplicationComponents/pqColorAnnotationsWidget.cxx b/Qt/ApplicationComponents/pqColorAnnotationsWidget.cxx -index df78e888a..8e99a70f7 100644 ---- a/Qt/ApplicationComponents/pqColorAnnotationsWidget.cxx -+++ b/Qt/ApplicationComponents/pqColorAnnotationsWidget.cxx -@@ -218,10 +218,10 @@ public: - { - this->SetCurrentPresetName(""); - this->Ui.setupUi(self); -- this->Ui.gridLayout->setMargin(pqPropertiesPanel::suggestedMargin()); -+ this->Ui.gridLayout->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - this->Ui.gridLayout->setVerticalSpacing(pqPropertiesPanel::suggestedVerticalSpacing()); - this->Ui.gridLayout->setHorizontalSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); -- this->Ui.verticalLayout->setMargin(pqPropertiesPanel::suggestedMargin()); -+ this->Ui.verticalLayout->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - this->Ui.verticalLayout->setSpacing(pqPropertiesPanel::suggestedVerticalSpacing()); - - this->Model = new pqAnnotationsModel(self); -diff --git a/Qt/ApplicationComponents/pqColorEditorPropertyWidget.cxx b/Qt/ApplicationComponents/pqColorEditorPropertyWidget.cxx -index 8229bd33c..1ba99001c 100644 ---- a/Qt/ApplicationComponents/pqColorEditorPropertyWidget.cxx -+++ b/Qt/ApplicationComponents/pqColorEditorPropertyWidget.cxx -@@ -62,7 +62,7 @@ pqColorEditorPropertyWidget::pqColorEditorPropertyWidget(vtkSMProxy* smProxy, QW - - Ui::ColorEditorPropertyWidget& Ui = this->Internals->Ui; - Ui.setupUi(this); -- Ui.gridLayout->setMargin(pqPropertiesPanel::suggestedMargin()); -+ Ui.gridLayout->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - Ui.gridLayout->setHorizontalSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); - Ui.gridLayout->setVerticalSpacing(pqPropertiesPanel::suggestedVerticalSpacing()); - -diff --git a/Qt/ApplicationComponents/pqColorMapEditor.cxx b/Qt/ApplicationComponents/pqColorMapEditor.cxx -index f3026bec2..8b518d781 100644 ---- a/Qt/ApplicationComponents/pqColorMapEditor.cxx -+++ b/Qt/ApplicationComponents/pqColorMapEditor.cxx -@@ -79,7 +79,7 @@ public: - this->Ui.setupUi(self); - - QVBoxLayout* vbox = new QVBoxLayout(this->Ui.PropertiesFrame); -- vbox->setMargin(0); -+ vbox->setContentsMargins(0,0,0,0); - vbox->setSpacing(0); - } - -diff --git a/Qt/ApplicationComponents/pqColorOpacityEditorWidget.cxx b/Qt/ApplicationComponents/pqColorOpacityEditorWidget.cxx -index a14d8bd01..b082339dd 100644 ---- a/Qt/ApplicationComponents/pqColorOpacityEditorWidget.cxx -+++ b/Qt/ApplicationComponents/pqColorOpacityEditorWidget.cxx -@@ -232,7 +232,7 @@ public: - , SignalsBlocker(new pqSignalsBlocker(self)) - { - this->Ui.setupUi(self); -- this->Ui.mainLayout->setMargin(pqPropertiesPanel::suggestedMargin()); -+ this->Ui.mainLayout->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - - this->Decorator = new pqColorOpacityEditorWidgetDecorator(nullptr, self); - -diff --git a/Qt/ApplicationComponents/pqColorPaletteSelectorWidget.cxx b/Qt/ApplicationComponents/pqColorPaletteSelectorWidget.cxx -index abab44ca3..36d0a2adb 100644 ---- a/Qt/ApplicationComponents/pqColorPaletteSelectorWidget.cxx -+++ b/Qt/ApplicationComponents/pqColorPaletteSelectorWidget.cxx -@@ -55,7 +55,7 @@ pqColorPaletteSelectorWidget::pqColorPaletteSelectorWidget( - - QVBoxLayout* vbox = new QVBoxLayout(this); - vbox->setSpacing(0); -- vbox->setMargin(0); -+ vbox->setContentsMargins(0,0,0,0); - - vtkSMSessionProxyManager* pxm = smproxy->GetSessionProxyManager(); - vtkSMProxyDefinitionManager* pdmgr = pxm->GetProxyDefinitionManager(); -@@ -91,7 +91,7 @@ pqColorPaletteSelectorWidget::pqColorPaletteSelectorWidget( - if (std::find(mainPalettes.cbegin(), mainPalettes.cend(), iter->GetProxyName()) == - mainPalettes.cend()) - { -- cbbox->addItem(prototype->GetXMLLabel(), prototype->GetXMLName()); -+ cbbox->addItem(prototype->GetXMLLabel(), QString(prototype->GetXMLName())); - } - } - -diff --git a/Qt/ApplicationComponents/pqColorSelectorPropertyWidget.cxx b/Qt/ApplicationComponents/pqColorSelectorPropertyWidget.cxx -index 14b743090..448fe3c87 100644 ---- a/Qt/ApplicationComponents/pqColorSelectorPropertyWidget.cxx -+++ b/Qt/ApplicationComponents/pqColorSelectorPropertyWidget.cxx -@@ -50,7 +50,7 @@ pqColorSelectorPropertyWidget::pqColorSelectorPropertyWidget( - - QVBoxLayout* vbox = new QVBoxLayout(this); - vbox->setSpacing(0); -- vbox->setMargin(0); -+ vbox->setContentsMargins(0,0,0,0); - - if (useDocumentationForLabels) - { -diff --git a/Qt/ApplicationComponents/pqCommandButtonPropertyWidget.cxx b/Qt/ApplicationComponents/pqCommandButtonPropertyWidget.cxx -index 12d36484b..eba09f8ab 100644 ---- a/Qt/ApplicationComponents/pqCommandButtonPropertyWidget.cxx -+++ b/Qt/ApplicationComponents/pqCommandButtonPropertyWidget.cxx -@@ -48,7 +48,7 @@ pqCommandButtonPropertyWidget::pqCommandButtonPropertyWidget( - { - QVBoxLayout* l = new QVBoxLayout; - l->setSpacing(0); -- l->setMargin(0); -+ l->setContentsMargins(0,0,0,0); - - QPushButton* button = new QPushButton(proxyProperty->GetXMLLabel()); - connect(button, SIGNAL(clicked()), this, SLOT(buttonClicked())); -diff --git a/Qt/ApplicationComponents/pqCommandLineOptionsBehavior.cxx b/Qt/ApplicationComponents/pqCommandLineOptionsBehavior.cxx -index 8801d1477..461da4bcf 100644 ---- a/Qt/ApplicationComponents/pqCommandLineOptionsBehavior.cxx -+++ b/Qt/ApplicationComponents/pqCommandLineOptionsBehavior.cxx -@@ -67,7 +67,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include - #include - #include --#include -+#include - #include - #include - -@@ -152,7 +152,7 @@ void pqCommandLineOptionsBehavior::processServerConnection() - if (serverURL.indexOf('|') != -1) - { - // We should connect multiple times -- const QStringList urls = serverURL.split(QRegExp("\\|"), PV_QT_SKIP_EMPTY_PARTS); -+ const QStringList urls = serverURL.split(QRegularExpression("\\|"), PV_QT_SKIP_EMPTY_PARTS); - for (const QString& url : urls) - { - if (!pqServerConnectReaction::connectToServer(pqServerResource(url), false)) -diff --git a/Qt/ApplicationComponents/pqCustomizeShortcutsDialog.cxx b/Qt/ApplicationComponents/pqCustomizeShortcutsDialog.cxx -index 74dfea1ec..f6cfa8f59 100644 ---- a/Qt/ApplicationComponents/pqCustomizeShortcutsDialog.cxx -+++ b/Qt/ApplicationComponents/pqCustomizeShortcutsDialog.cxx -@@ -41,6 +41,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include - #include - #include -+#include - - namespace - { -@@ -432,9 +433,9 @@ pqCustomizeShortcutsDialog::pqCustomizeShortcutsDialog(QWidget* parentObject) - connect(this->Internals->Ui.recordButton, &QAbstractButton::clicked, this, - [this]() { this->Internals->Ui.keySequenceEdit->setFocus(); }); - connect(this->Internals->Ui.searchBox, &pqSearchBox::textChanged, this, [this]() { -- QRegExp regex(this->Internals->Ui.searchBox->text(), Qt::CaseInsensitive); -+ QRegularExpression regex(this->Internals->Ui.searchBox->text(), QRegularExpression::CaseInsensitiveOption); - -- this->Internals->FilterModel->setFilterRegExp(regex); -+ this->Internals->FilterModel->setFilterRegularExpression(regex); - this->Internals->Ui.treeView->expandAll(); - }); - this->setWindowTitle("Customize Shortcuts"); -diff --git a/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx b/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx -index 9f7d66617..307ad5a68 100644 ---- a/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx -+++ b/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx -@@ -64,7 +64,7 @@ pqDoubleRangeSliderPropertyWidget::pqDoubleRangeSliderPropertyWidget( - Ui::DoubleRangeSliderPropertyWidget& ui = this->Internals->Ui; - ui.setupUi(this); - -- ui.gridLayout->setMargin(pqPropertiesPanel::suggestedMargin()); -+ ui.gridLayout->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - ui.gridLayout->setVerticalSpacing(pqPropertiesPanel::suggestedVerticalSpacing()); - ui.gridLayout->setHorizontalSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); - -diff --git a/Qt/ApplicationComponents/pqEqualizerPropertyWidget.cxx b/Qt/ApplicationComponents/pqEqualizerPropertyWidget.cxx -index 584f79db1..50ce1160a 100644 ---- a/Qt/ApplicationComponents/pqEqualizerPropertyWidget.cxx -+++ b/Qt/ApplicationComponents/pqEqualizerPropertyWidget.cxx -@@ -66,7 +66,7 @@ pqEqualizerPropertyWidget::pqEqualizerPropertyWidget( - - // Setup GUI - QGridLayout* layout = new QGridLayout(this); -- layout->setMargin(pqPropertiesPanel::suggestedMargin()); -+ layout->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - layout->setVerticalSpacing(pqPropertiesPanel::suggestedVerticalSpacing()); - layout->setHorizontalSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); - -diff --git a/Qt/ApplicationComponents/pqFileNamePropertyWidget.cxx b/Qt/ApplicationComponents/pqFileNamePropertyWidget.cxx -index 9acba56a2..5b4b344cb 100644 ---- a/Qt/ApplicationComponents/pqFileNamePropertyWidget.cxx -+++ b/Qt/ApplicationComponents/pqFileNamePropertyWidget.cxx -@@ -73,7 +73,7 @@ pqFileNamePropertyWidget::pqFileNamePropertyWidget( - } - - QHBoxLayout* layoutLocal = new QHBoxLayout; -- layoutLocal->setMargin(0); -+ layoutLocal->setContentsMargins(0,0,0,0); - layoutLocal->setSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); - - QLineEdit* lineEdit = new pqLineEdit(this); -diff --git a/Qt/ApplicationComponents/pqFindDataWidget.cxx b/Qt/ApplicationComponents/pqFindDataWidget.cxx -index 1f4ec82d1..3f310489e 100644 ---- a/Qt/ApplicationComponents/pqFindDataWidget.cxx -+++ b/Qt/ApplicationComponents/pqFindDataWidget.cxx -@@ -272,7 +272,7 @@ pqFindDataWidget::pqFindDataWidget(QWidget* parentObject) - { - auto& internals = (*this->Internals); - internals.Ui.setupUi(this); -- internals.Ui.verticalLayout->setMargin(pqPropertiesPanel::suggestedMargin()); -+ internals.Ui.verticalLayout->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - internals.Ui.verticalLayout->setSpacing(pqPropertiesPanel::suggestedVerticalSpacing()); - - // change the findData button palette so it is green when it is enabled. -diff --git a/Qt/ApplicationComponents/pqFontPropertyWidget.cxx b/Qt/ApplicationComponents/pqFontPropertyWidget.cxx -index 156e39160..5481e1d2d 100644 ---- a/Qt/ApplicationComponents/pqFontPropertyWidget.cxx -+++ b/Qt/ApplicationComponents/pqFontPropertyWidget.cxx -@@ -50,7 +50,7 @@ public: - pqInternals(pqFontPropertyWidget* self) - { - this->Ui.setupUi(self); -- this->Ui.mainLayout->setMargin(pqPropertiesPanel::suggestedMargin()); -+ this->Ui.mainLayout->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - this->Ui.mainLayout->setSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); - } - -diff --git a/Qt/ApplicationComponents/pqListPropertyWidget.cxx b/Qt/ApplicationComponents/pqListPropertyWidget.cxx -index df1f8d616..c42d70e55 100644 ---- a/Qt/ApplicationComponents/pqListPropertyWidget.cxx -+++ b/Qt/ApplicationComponents/pqListPropertyWidget.cxx -@@ -94,7 +94,7 @@ pqListPropertyWidget::pqListPropertyWidget( - this->TableWidget->setHorizontalHeaderLabels(headerLabels); - - QHBoxLayout* hbox = new QHBoxLayout(this); -- hbox->setMargin(0); -+ hbox->setContentsMargins(0,0,0,0); - hbox->setSpacing(0); - hbox->addWidget(this->TableWidget); - -diff --git a/Qt/ApplicationComponents/pqLoadDataReaction.cxx b/Qt/ApplicationComponents/pqLoadDataReaction.cxx -index b9d348c62..b056c0888 100644 ---- a/Qt/ApplicationComponents/pqLoadDataReaction.cxx -+++ b/Qt/ApplicationComponents/pqLoadDataReaction.cxx -@@ -55,6 +55,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include - #include - #include -+#include - - #include - -diff --git a/Qt/ApplicationComponents/pqLoadDataReaction.h b/Qt/ApplicationComponents/pqLoadDataReaction.h -index 5a3f81fcc..0ac81f1ee 100644 ---- a/Qt/ApplicationComponents/pqLoadDataReaction.h -+++ b/Qt/ApplicationComponents/pqLoadDataReaction.h -@@ -35,8 +35,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include "pqReaction.h" - - #include -+#include - --class QStringList; - class pqPipelineSource; - class pqServer; - class vtkSMReaderFactory; -diff --git a/Qt/ApplicationComponents/pqMoleculePropertyWidget.cxx b/Qt/ApplicationComponents/pqMoleculePropertyWidget.cxx -index 1f788de5f..c8a85d436 100644 ---- a/Qt/ApplicationComponents/pqMoleculePropertyWidget.cxx -+++ b/Qt/ApplicationComponents/pqMoleculePropertyWidget.cxx -@@ -57,7 +57,7 @@ public: - , showAdvancedProperties(false) - { - this->Ui.setupUi(self); -- this->Ui.wdgLayout->setMargin(pqPropertiesPanel::suggestedMargin()); -+ this->Ui.wdgLayout->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - this->Ui.wdgLayout->setSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); - } - }; -diff --git a/Qt/ApplicationComponents/pqParaViewBehaviors.cxx b/Qt/ApplicationComponents/pqParaViewBehaviors.cxx -index 70ca91c4c..51d56e098 100644 ---- a/Qt/ApplicationComponents/pqParaViewBehaviors.cxx -+++ b/Qt/ApplicationComponents/pqParaViewBehaviors.cxx -@@ -312,7 +312,7 @@ pqParaViewBehaviors::pqParaViewBehaviors(QMainWindow* mainWindow, QObject* paren - QShortcut* ctrlSpace = new QShortcut(Qt::CTRL + Qt::Key_Space, mainWindow); - QObject::connect( - ctrlSpace, SIGNAL(activated()), pqApplicationCore::instance(), SLOT(quickLaunch())); -- QShortcut* ctrlShiftSpace = new QShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_Space, mainWindow); -+ QShortcut* ctrlShiftSpace = new QShortcut(QKeySequence(Qt::CTRL,Qt::SHIFT,Qt::Key_Space), mainWindow); - QObject::connect( - ctrlShiftSpace, SIGNAL(activated()), pqApplicationCore::instance(), SLOT(quickLaunch())); - QShortcut* altSpace = new QShortcut(Qt::ALT + Qt::Key_Space, mainWindow); -diff --git a/Qt/ApplicationComponents/pqPauseLiveSourcePropertyWidget.cxx b/Qt/ApplicationComponents/pqPauseLiveSourcePropertyWidget.cxx -index 7b47c2331..b9a527dd9 100644 ---- a/Qt/ApplicationComponents/pqPauseLiveSourcePropertyWidget.cxx -+++ b/Qt/ApplicationComponents/pqPauseLiveSourcePropertyWidget.cxx -@@ -43,7 +43,7 @@ pqPauseLiveSourcePropertyWidget::pqPauseLiveSourcePropertyWidget( - { - auto l = new QVBoxLayout(this); - l->setSpacing(0); -- l->setMargin(0); -+ l->setContentsMargins(0,0,0,0); - - auto button = new QPushButton(smproperty->GetXMLLabel()); - button->setCheckable(true); -diff --git a/Qt/ApplicationComponents/pqPluginActionGroupBehavior.cxx b/Qt/ApplicationComponents/pqPluginActionGroupBehavior.cxx -index 42d0df52e..1ae9d9edd 100644 ---- a/Qt/ApplicationComponents/pqPluginActionGroupBehavior.cxx -+++ b/Qt/ApplicationComponents/pqPluginActionGroupBehavior.cxx -@@ -40,6 +40,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include - #include - #include -+#include - - namespace - { -diff --git a/Qt/ApplicationComponents/pqSelectionQueryPropertyWidget.cxx b/Qt/ApplicationComponents/pqSelectionQueryPropertyWidget.cxx -index f65f05bc1..0fa92649c 100644 ---- a/Qt/ApplicationComponents/pqSelectionQueryPropertyWidget.cxx -+++ b/Qt/ApplicationComponents/pqSelectionQueryPropertyWidget.cxx -@@ -220,7 +220,7 @@ private: - case COMMA_SEPARATED_VALUES: - { - auto vbox = new QVBoxLayout(this); -- vbox->setMargin(0); -+ vbox->setContentsMargins(0,0,0,0); - vbox->setSpacing(pqPropertiesPanel::suggestedVerticalSpacing()); - auto edit = new pqLineEdit(this); - this->LineEdits.push_back(edit); -@@ -234,7 +234,7 @@ private: - case RANGE_PAIR: - { - auto hbox = new QHBoxLayout(this); -- hbox->setMargin(0); -+ hbox->setContentsMargins(0,0,0,0); - hbox->setSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); - - auto editMin = new pqLineEdit(this); -@@ -259,7 +259,7 @@ private: - case LOCATION_WITH_TOLERANCE: - { - auto grid = new QGridLayout(this); -- grid->setMargin(0); -+ grid->setContentsMargins(0,0,0,0); - grid->setVerticalSpacing(pqPropertiesPanel::suggestedVerticalSpacing()); - grid->setHorizontalSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); - auto editX = new pqDoubleLineEdit(this); -@@ -332,7 +332,7 @@ public: - this->Operator->setSizeAdjustPolicy(QComboBox::AdjustToContents); - - auto hbox = new QHBoxLayout(this); -- hbox->setMargin(0); -+ hbox->setContentsMargins(0,0,0,0); - hbox->setSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); - hbox->addWidget(this->Term, 0, Qt::AlignTop); - hbox->addWidget(this->Operator, 0, Qt::AlignTop); -@@ -620,7 +620,7 @@ class pqSelectionQueryPropertyWidget::pqInternals - void insertQuery(int index, const QString& expr = QString()) - { - auto hbox = new QHBoxLayout(); -- hbox->setMargin(0); -+ hbox->setContentsMargins(0,0,0,0); - hbox->setSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); - - auto wdg = new QueryWidgetType(this->Parent); -@@ -704,7 +704,7 @@ public: - : Parent(self) - { - auto vbox = new QVBoxLayout(self); -- vbox->setMargin(0); -+ vbox->setContentsMargins(0,0,0,0); - vbox->setSpacing(pqPropertiesPanel::suggestedVerticalSpacing()); - } - -diff --git a/Qt/ApplicationComponents/pqSelectionQueryPropertyWidget.h b/Qt/ApplicationComponents/pqSelectionQueryPropertyWidget.h -index 266c0dced..e992ef390 100644 ---- a/Qt/ApplicationComponents/pqSelectionQueryPropertyWidget.h -+++ b/Qt/ApplicationComponents/pqSelectionQueryPropertyWidget.h -@@ -36,8 +36,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include "pqPropertyWidget.h" - - #include // for QScopedPointer. -+#include - --class QStringList; - - /** - * @class pqSelectionQueryPropertyWidget -diff --git a/Qt/ApplicationComponents/pqSeriesEditorPropertyWidget.cxx b/Qt/ApplicationComponents/pqSeriesEditorPropertyWidget.cxx -index 01b7b5267..be270a60e 100644 ---- a/Qt/ApplicationComponents/pqSeriesEditorPropertyWidget.cxx -+++ b/Qt/ApplicationComponents/pqSeriesEditorPropertyWidget.cxx -@@ -128,7 +128,7 @@ public: - vtkSMPropertyHelper(lutProxy, "IndexedLookup").Set(1); - - this->Ui.setupUi(self); -- this->Ui.wdgLayout->setMargin(pqPropertiesPanel::suggestedMargin()); -+ this->Ui.wdgLayout->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - this->Ui.wdgLayout->setHorizontalSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); - this->Ui.wdgLayout->setVerticalSpacing(pqPropertiesPanel::suggestedVerticalSpacing()); - -diff --git a/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx b/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx -index fe9a17ffb..359e88c71 100644 ---- a/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx -+++ b/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx -@@ -76,6 +76,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include - #include - #include -+#include - - #include - #include -diff --git a/Qt/ApplicationComponents/pqTextLocationWidget.cxx b/Qt/ApplicationComponents/pqTextLocationWidget.cxx -index eab16a74f..732b18174 100644 ---- a/Qt/ApplicationComponents/pqTextLocationWidget.cxx -+++ b/Qt/ApplicationComponents/pqTextLocationWidget.cxx -@@ -50,7 +50,7 @@ public: - pqInternals(pqTextLocationWidget* self) - { - this->Ui.setupUi(self); -- this->Ui.gridLayout->setMargin(pqPropertiesPanel::suggestedMargin()); -+ this->Ui.gridLayout->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - this->Ui.gridLayout->setSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); - - // Add location enum values to the buttons -diff --git a/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx b/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx -index bee6a033e..47314b3ab 100644 ---- a/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx -+++ b/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx -@@ -43,6 +43,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include - #include - #include -+#include - - class pqViewResolutionPropertyWidget::pqInternals - { -diff --git a/Qt/ApplicationComponents/pqViewTypePropertyWidget.cxx b/Qt/ApplicationComponents/pqViewTypePropertyWidget.cxx -index bd4efc988..e14fb95ca 100644 ---- a/Qt/ApplicationComponents/pqViewTypePropertyWidget.cxx -+++ b/Qt/ApplicationComponents/pqViewTypePropertyWidget.cxx -@@ -49,7 +49,7 @@ pqViewTypePropertyWidget::pqViewTypePropertyWidget( - this->ComboBox = new QComboBox(this); - this->ComboBox->setObjectName("ComboBox"); - QVBoxLayout* vbox = new QVBoxLayout(this); -- vbox->setMargin(0); -+ vbox->setContentsMargins(0,0,0,0); - vbox->addWidget(this->ComboBox); - - this->ComboBox->addItem("None", QVariant("None")); -diff --git a/Qt/Components/CMakeLists.txt b/Qt/Components/CMakeLists.txt -index 1c4b9950a..4ccf4f75c 100644 ---- a/Qt/Components/CMakeLists.txt -+++ b/Qt/Components/CMakeLists.txt -@@ -254,7 +254,7 @@ set(resource_files - Resources/pqComponents.qrc) - - vtk_module_find_package( -- PACKAGE Qt5 -+ PACKAGE Qt${VTK_QT_VERSION} - COMPONENTS Network Widgets) - - source_group("Resources" FILES -@@ -273,6 +273,6 @@ vtk_module_add_module(ParaView::pqComponents - ${resource_files}) - vtk_module_link(ParaView::pqComponents - PRIVATE -- Qt5::Network -- Qt5::Widgets) -+ Qt${VTK_QT_VERSION}::Network -+ Qt${VTK_QT_VERSION}::Widgets) - vtk_module_definitions(ParaView::pqComponents PRIVATE QT_NO_KEYWORDS) -diff --git a/Qt/Components/Resources/UI/pqAboutDialog.ui b/Qt/Components/Resources/UI/pqAboutDialog.ui -index 387cfe4a7..cbea4be71 100644 ---- a/Qt/Components/Resources/UI/pqAboutDialog.ui -+++ b/Qt/Components/Resources/UI/pqAboutDialog.ui -@@ -1,7 +1,14 @@ - - -+ -+ -+ pqAboutDialog -+ QDialog -+
pqAboutDialog.h
-+ -+ - pqAboutDialog -- -+ - - - 0 - diff --git a/Qt/Components/Resources/UI/pqAboutDialog.ui b/Qt/Components/Resources/UI/pqAboutDialog.ui -diff --git a/Qt/Components/Testing/Cxx/CMakeLists.txt b/Qt/Components/Testing/Cxx/CMakeLists.txt -index 73430cd93..720041a1c 100644 ---- a/Qt/Components/Testing/Cxx/CMakeLists.txt -+++ b/Qt/Components/Testing/Cxx/CMakeLists.txt -@@ -1,14 +1,14 @@ --find_package(Qt5 REQUIRED COMPONENTS Core Widgets) -+find_package(Qt${VTK_QT_VERSION} REQUIRED COMPONENTS Core Widgets) - set(CMAKE_AUTOMOC 1) - vtk_module_test_executable(pqPipelineApp FilteredPipelineBrowserApp.cxx FilteredPipelineBrowserApp.h) --target_link_libraries(pqPipelineApp PRIVATE Qt5::Core Qt5::Widgets) -+target_link_libraries(pqPipelineApp PRIVATE Qt${VTK_QT_VERSION}::Core Qt${VTK_QT_VERSION}::Widgets) - #ADD_TEST(pqPipelineApp "${EXECUTABLE_OUTPUT_PATH}/pqPipelineApp" -dr "--test-directory=${PARAVIEW_TEST_DIR}") - - set(tests_sources - TabbedMultiViewWidgetFilteringApp.cxx) - create_test_sourcelist(tests pqComponentsTest.cxx ${tests_sources}) - vtk_module_test_executable(pqComponentsTest ${tests}) --target_link_libraries(pqComponentsTest PRIVATE Qt5::Core Qt5::Widgets) -+target_link_libraries(pqComponentsTest PRIVATE Qt${VTK_QT_VERSION}::Core Qt${VTK_QT_VERSION}::Widgets) - - foreach(test_file IN LISTS tests_sources) - get_filename_component(test "${test_file}" NAME_WE) -diff --git a/Qt/Components/pqAnimationViewWidget.cxx b/Qt/Components/pqAnimationViewWidget.cxx -index 1efa71732..d8f29afde 100644 ---- a/Qt/Components/pqAnimationViewWidget.cxx -+++ b/Qt/Components/pqAnimationViewWidget.cxx -@@ -274,12 +274,12 @@ pqAnimationViewWidget::pqAnimationViewWidget(QWidget* _parent) - { - this->Internal = new pqAnimationViewWidget::pqInternal(); - QVBoxLayout* vboxlayout = new QVBoxLayout(this); -- vboxlayout->setMargin(2); -+ vboxlayout->setContentsMargins(2,2,2,2); - vboxlayout->setSpacing(2); - - QHBoxLayout* hboxlayout = new QHBoxLayout; - vboxlayout->addLayout(hboxlayout); -- hboxlayout->setMargin(0); -+ hboxlayout->setContentsMargins(0,0,0,0); - hboxlayout->setSpacing(2); - - hboxlayout->addWidget(new QLabel("Mode:", this)); -@@ -343,7 +343,7 @@ pqAnimationViewWidget::pqAnimationViewWidget(QWidget* _parent) - this->Internal->AnimationWidget->animationModel()->setTimePrecision( - vtkPVGeneralSettings::GetInstance()->GetAnimationTimePrecision()); - this->Internal->AnimationWidget->animationModel()->setTimeNotation( -- vtkPVGeneralSettings::GetInstance()->GetAnimationTimeNotation()); -+ QChar(vtkPVGeneralSettings::GetInstance()->GetAnimationTimeNotation())); - - pqCoreUtilities::connect(vtkPVGeneralSettings::GetInstance(), vtkCommand::ModifiedEvent, this, - SLOT(generalSettingsChanged())); -@@ -359,7 +359,7 @@ pqAnimationViewWidget::pqAnimationViewWidget(QWidget* _parent) - this->Internal->CreateSource->setSizeAdjustPolicy(QComboBox::AdjustToContents); - this->Internal->CreateProperty->setSizeAdjustPolicy(QComboBox::AdjustToContents); - QHBoxLayout* l = new QHBoxLayout(w); -- l->setMargin(0); -+ l->setContentsMargins(0,0,0,0); - l->addSpacing(6); - l->addWidget(this->Internal->CreateSource); - l->addWidget(this->Internal->CreateProperty); -@@ -1134,7 +1134,7 @@ void pqAnimationViewWidget::generalSettingsChanged() - this->Internal->AnimationWidget->animationModel()->setTimePrecision( - vtkPVGeneralSettings::GetInstance()->GetAnimationTimePrecision()); - this->Internal->AnimationWidget->animationModel()->setTimeNotation( -- vtkPVGeneralSettings::GetInstance()->GetAnimationTimeNotation()); -+ QChar(vtkPVGeneralSettings::GetInstance()->GetAnimationTimeNotation())); - } - - //----------------------------------------------------------------------------- -diff --git a/Qt/Components/pqArrayListWidget.cxx b/Qt/Components/pqArrayListWidget.cxx -index 33a6e7202..e4aab913f 100644 ---- a/Qt/Components/pqArrayListWidget.cxx -+++ b/Qt/Components/pqArrayListWidget.cxx -@@ -122,7 +122,7 @@ pqArrayListWidget::pqArrayListWidget(QWidget* parent) - auto lay = new QVBoxLayout(this); - this->TableView = new pqExpandableTableView(this); - lay->addWidget(this->TableView); -- lay->setMargin(0); -+ lay->setContentsMargins(0,0,0,0); - lay->setSpacing(2); - - pqHeaderView* myheader = new pqHeaderView(Qt::Horizontal, this->TableView); -diff --git a/Qt/Components/pqArraySelectorPropertyWidget.cxx b/Qt/Components/pqArraySelectorPropertyWidget.cxx -index 94251e7ff..3da5f55c0 100644 ---- a/Qt/Components/pqArraySelectorPropertyWidget.cxx -+++ b/Qt/Components/pqArraySelectorPropertyWidget.cxx -@@ -239,7 +239,7 @@ pqArraySelectorPropertyWidget::pqArraySelectorPropertyWidget( - - auto l = new QVBoxLayout(this); - l->setSpacing(0); -- l->setMargin(0); -+ l->setContentsMargins(0,0,0,0); - - auto combobox = new QComboBox(this); - combobox->setObjectName("ComboBox"); -diff --git a/Qt/Components/pqArrayStatusPropertyWidget.cxx b/Qt/Components/pqArrayStatusPropertyWidget.cxx -index 4958265a0..d5904de1d 100644 ---- a/Qt/Components/pqArrayStatusPropertyWidget.cxx -+++ b/Qt/Components/pqArrayStatusPropertyWidget.cxx -@@ -136,7 +136,7 @@ pqArrayStatusPropertyWidget::pqArrayStatusPropertyWidget( - - QHBoxLayout* hbox = new QHBoxLayout(this); - hbox->addWidget(selectorWidget); -- hbox->setMargin(0); -+ hbox->setContentsMargins(0,0,0,0); - hbox->setSpacing(4); - - for (unsigned int cc = 0; cc < smgroup->GetNumberOfProperties(); cc++) -@@ -210,7 +210,7 @@ pqArrayStatusPropertyWidget::pqArrayStatusPropertyWidget( - - QHBoxLayout* hbox = new QHBoxLayout(this); - hbox->addWidget(selectorWidget); -- hbox->setMargin(0); -+ hbox->setContentsMargins(0,0,0,0); - hbox->setSpacing(4); - - const char* property_name = smproxy->GetPropertyName(smproperty); -diff --git a/Qt/Components/pqCameraKeyFrameWidget.cxx b/Qt/Components/pqCameraKeyFrameWidget.cxx -index d5a635a10..d3e043045 100644 ---- a/Qt/Components/pqCameraKeyFrameWidget.cxx -+++ b/Qt/Components/pqCameraKeyFrameWidget.cxx -@@ -197,7 +197,7 @@ pqCameraKeyFrameWidget::pqCameraKeyFrameWidget(QWidget* parentObject) - this->Internal->PSplineWidget->filterWidgets(); - - (new QVBoxLayout(this->Internal->positionContainer))->addWidget(this->Internal->PSplineWidget); -- this->Internal->positionContainer->layout()->setMargin(0); -+ this->Internal->positionContainer->layout()->setContentsMargins(0,0,0,0); - - this->Internal->FSplineProxy.TakeReference(pxm->NewProxy("parametric_functions", "Spline")); - this->Internal->PSplineProxy->SetLocation(vtkPVSession::CLIENT); -@@ -210,7 +210,7 @@ pqCameraKeyFrameWidget::pqCameraKeyFrameWidget(QWidget* parentObject) - this->Internal->FSplineWidget->filterWidgets(); - - (new QVBoxLayout(this->Internal->focusContainer))->addWidget(this->Internal->FSplineWidget); -- this->Internal->focusContainer->layout()->setMargin(0); -+ this->Internal->focusContainer->layout()->setContentsMargins(0,0,0,0); - } - - //----------------------------------------------------------------------------- -diff --git a/Qt/Components/pqComboBoxDomain.cxx b/Qt/Components/pqComboBoxDomain.cxx -index bde1fc79d..d6091d01d 100644 ---- a/Qt/Components/pqComboBoxDomain.cxx -+++ b/Qt/Components/pqComboBoxDomain.cxx -@@ -264,15 +264,15 @@ void pqComboBoxDomain::internalDomainChanged() - QList proxies = pqSMAdaptor::getProxyPropertyDomain(this->Internal->Property); - Q_FOREACH (vtkSMProxy* pxy, proxies) - { -- texts.append(pxy->GetXMLLabel()); -- data.append(pxy->GetXMLLabel()); -+ texts.append(QString(pxy->GetXMLLabel())); -+ data.append(QString(pxy->GetXMLLabel())); - infos.append(QString()); - icons.append(QIcon()); - } - pqSMProxy cur_value = pqSMAdaptor::getProxyProperty(this->Internal->Property); - if (cur_value) - { -- cur_property_value = cur_value->GetXMLLabel(); -+ cur_property_value = QString(cur_value->GetXMLLabel()); - } - } - -@@ -350,7 +350,7 @@ void pqComboBoxDomain::internalDomainChanged() - pqSMProxy cur_value = pqSMAdaptor::getProxyProperty(this->Internal->Property); - if (cur_value) - { -- cur_property_value = cur_value->GetXMLLabel(); -+ cur_property_value = QString(cur_value->GetXMLLabel()); - } - } - break; -diff --git a/Qt/Components/pqCommandPropertyWidget.cxx b/Qt/Components/pqCommandPropertyWidget.cxx -index adbee9842..38a558450 100644 ---- a/Qt/Components/pqCommandPropertyWidget.cxx -+++ b/Qt/Components/pqCommandPropertyWidget.cxx -@@ -54,7 +54,7 @@ pqCommandPropertyWidget::pqCommandPropertyWidget( - QObject::connect(button, SIGNAL(clicked()), this, SLOT(buttonClicked())); - - QHBoxLayout* layoutLocal = new QHBoxLayout(this); -- layoutLocal->setMargin(0); -+ layoutLocal->setContentsMargins(0,0,0,0); - layoutLocal->addWidget(button); - layoutLocal->addStretch(); - this->setShowLabel(false); -diff --git a/Qt/Components/pqComparativeCueWidget.cxx b/Qt/Components/pqComparativeCueWidget.cxx -index c0842e0e5..bfbb616db 100644 ---- a/Qt/Components/pqComparativeCueWidget.cxx -+++ b/Qt/Components/pqComparativeCueWidget.cxx -@@ -32,7 +32,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include "pqComparativeCueWidget.h" - #include "ui_pqComparativeParameterRangeDialog.h" - --#include -+#include -+#include - - #include "pqQtDeprecated.h" - #include "pqUndoStack.h" -@@ -249,10 +250,10 @@ void pqComparativeCueWidget::editRange() - ui.multivalueHint->setVisible(csv); - ui.mode->setVisible(ranges[0].rowCount() > 1 && ranges[0].columnCount() > 1); - -- QRegExp floatNum = QRegExp("[-+]?[0-9]*\\.?[0-9]+([eE][-+]?[0-9]+)?"); -- QRegExp csvFloatNum = QRegExp(QString("%1(,%1)*").arg(floatNum.pattern())); -- ui.minValue->setValidator(new QRegExpValidator(csv ? csvFloatNum : floatNum, ui.minValue)); -- ui.maxValue->setValidator(new QRegExpValidator(csv ? csvFloatNum : floatNum, ui.maxValue)); -+ QRegularExpression floatNum = QRegularExpression("[-+]?[0-9]*\\.?[0-9]+([eE][-+]?[0-9]+)?"); -+ QRegularExpression csvFloatNum = QRegularExpression(QString("%1(,%1)*").arg(floatNum.pattern())); -+ ui.minValue->setValidator(new QRegularExpressionValidator(csv ? csvFloatNum : floatNum, ui.minValue)); -+ ui.maxValue->setValidator(new QRegularExpressionValidator(csv ? csvFloatNum : floatNum, ui.maxValue)); - - if (dialog.exec() != QDialog::Accepted) - { -diff --git a/Qt/Components/pqCustomFilterManager.h b/Qt/Components/pqCustomFilterManager.h -index 0d5f2b722..6d2900aad 100644 ---- a/Qt/Components/pqCustomFilterManager.h -+++ b/Qt/Components/pqCustomFilterManager.h -@@ -40,11 +40,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - #include "pqComponentsModule.h" - #include -+#include - - class pqCustomFilterManagerForm; - class pqCustomFilterManagerModel; - class QItemSelection; --class QStringList; - - /** - * \class pqCustomFilterManager -diff --git a/Qt/Components/pqDataInformationWidget.cxx b/Qt/Components/pqDataInformationWidget.cxx -index 0a0d3db55..971f25b27 100644 ---- a/Qt/Components/pqDataInformationWidget.cxx -+++ b/Qt/Components/pqDataInformationWidget.cxx -@@ -117,7 +117,7 @@ pqDataInformationWidget::pqDataInformationWidget(QWidget* _parent /*=0*/) - QVBoxLayout* _layout = new QVBoxLayout(this); - if (_layout) - { -- _layout->setMargin(0); -+ _layout->setContentsMargins(0,0,0,0); - _layout->addWidget(this->View); - } - -diff --git a/Qt/Components/pqDisplayColorWidget.cxx b/Qt/Components/pqDisplayColorWidget.cxx -index 3e0e50bc7..b36119de1 100644 ---- a/Qt/Components/pqDisplayColorWidget.cxx -+++ b/Qt/Components/pqDisplayColorWidget.cxx -@@ -253,7 +253,7 @@ pqDisplayColorWidget::pqDisplayColorWidget(QWidget* parentObject) - this->SolidColorIcon = new QIcon(":/pqWidgets/Icons/pqSolidColor.svg"); - - QHBoxLayout* hbox = new QHBoxLayout(this); -- hbox->setMargin(0); -+ hbox->setContentsMargins(0,0,0,0); - hbox->setSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); - - this->Variables = new QComboBox(this); -diff --git a/Qt/Components/pqDisplayPanelPropertyWidget.cxx b/Qt/Components/pqDisplayPanelPropertyWidget.cxx -index 55336fa31..8baf05a87 100644 ---- a/Qt/Components/pqDisplayPanelPropertyWidget.cxx -+++ b/Qt/Components/pqDisplayPanelPropertyWidget.cxx -@@ -41,7 +41,7 @@ pqDisplayPanelPropertyWidget::pqDisplayPanelPropertyWidget( - this->DisplayPanel = panel; - - QVBoxLayout* layoutLocal = new QVBoxLayout; -- layoutLocal->setMargin(0); -+ layoutLocal->setContentsMargins(0,0,0,0); - layoutLocal->addWidget(panel); - setLayout(layoutLocal); - } -diff --git a/Qt/Components/pqDisplayRepresentationWidget.cxx b/Qt/Components/pqDisplayRepresentationWidget.cxx -index 2992dc873..037e34f11 100644 ---- a/Qt/Components/pqDisplayRepresentationWidget.cxx -+++ b/Qt/Components/pqDisplayRepresentationWidget.cxx -@@ -252,7 +252,7 @@ pqDisplayRepresentationPropertyWidget::pqDisplayRepresentationPropertyWidget( - : pqPropertyWidget(smProxy, parentObject) - { - QVBoxLayout* layoutLocal = new QVBoxLayout; -- layoutLocal->setMargin(0); -+ layoutLocal->setContentsMargins(0,0,0,0); - this->Widget = new pqDisplayRepresentationWidget(this); - layoutLocal->addWidget(this->Widget); - setLayout(layoutLocal); -diff --git a/Qt/Components/pqDoubleVectorPropertyWidget.cxx b/Qt/Components/pqDoubleVectorPropertyWidget.cxx -index 050c218c0..2e001af3f 100644 ---- a/Qt/Components/pqDoubleVectorPropertyWidget.cxx -+++ b/Qt/Components/pqDoubleVectorPropertyWidget.cxx -@@ -102,7 +102,7 @@ pqDoubleVectorPropertyWidget::pqDoubleVectorPropertyWidget( - } - - QHBoxLayout* layoutLocal = new QHBoxLayout; -- layoutLocal->setMargin(0); -+ layoutLocal->setContentsMargins(0,0,0,0); - layoutLocal->setSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); - - this->setLayout(layoutLocal); -diff --git a/Qt/Components/pqExpressionsWidget.cxx b/Qt/Components/pqExpressionsWidget.cxx -index d45369ca7..1b7119797 100644 ---- a/Qt/Components/pqExpressionsWidget.cxx -+++ b/Qt/Components/pqExpressionsWidget.cxx -@@ -49,7 +49,7 @@ pqExpressionsWidget::pqExpressionsWidget(QWidget* parent, const QString& groupNa - , OneLiner(nullptr) - { - QGridLayout* grid = new QGridLayout(this); -- grid->setMargin(0); -+ grid->setContentsMargins(0,0,0,0); - grid->setSpacing(0); - - if (!groupName.isEmpty()) -@@ -60,6 +60,10 @@ pqExpressionsWidget::pqExpressionsWidget(QWidget* parent, const QString& groupNa - this->setLayout(grid); - } - -+void pqExpressionsWidget::clear() { -+ lineEdit()->clear(); -+} -+ - void pqExpressionsWidget::setupButtons(const QString& groupName) - { - auto grid = dynamic_cast(this->layout()); -diff --git a/Qt/Components/pqExpressionsWidget.h b/Qt/Components/pqExpressionsWidget.h -index 94d502a20..b3bf78f5b 100644 ---- a/Qt/Components/pqExpressionsWidget.h -+++ b/Qt/Components/pqExpressionsWidget.h -@@ -60,7 +60,7 @@ public: - * Set buttons up for "groupName" expressions group. - */ - void setupButtons(const QString& groupName); -- -+ void clear(); - private: - Q_DISABLE_COPY(pqExpressionsWidget) - -diff --git a/Qt/Components/pqFavoritesDialog.cxx b/Qt/Components/pqFavoritesDialog.cxx -index d59aa5965..8bd7fa6ef 100644 ---- a/Qt/Components/pqFavoritesDialog.cxx -+++ b/Qt/Components/pqFavoritesDialog.cxx -@@ -41,6 +41,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include - #include - #include -+#include -+#include - - // pqCore - #include "pqApplicationCore.h" -diff --git a/Qt/Components/pqFileChooserWidget.cxx b/Qt/Components/pqFileChooserWidget.cxx -index 434418559..d8e05c2cb 100644 ---- a/Qt/Components/pqFileChooserWidget.cxx -+++ b/Qt/Components/pqFileChooserWidget.cxx -@@ -51,7 +51,7 @@ pqFileChooserWidget::pqFileChooserWidget(QWidget* p) - this->AcceptAnyFile = false; - - QHBoxLayout* l = new QHBoxLayout(this); -- l->setMargin(0); -+ l->setContentsMargins(0,0,0,0); - l->setSpacing(2); - this->LineEdit = new QLineEdit(this); - this->LineEdit->setObjectName("FileLineEdit"); -diff --git a/Qt/Components/pqFindDataCurrentSelectionFrame.cxx b/Qt/Components/pqFindDataCurrentSelectionFrame.cxx -index 3c81e4f92..8a7a96353 100644 ---- a/Qt/Components/pqFindDataCurrentSelectionFrame.cxx -+++ b/Qt/Components/pqFindDataCurrentSelectionFrame.cxx -@@ -152,7 +152,7 @@ public: - pqApplicationCore::instance()->manager("SELECTION_MANAGER")); - - this->Ui.setupUi(self); -- this->Ui.gridLayout->setMargin(pqPropertiesPanel::suggestedMargin()); -+ this->Ui.gridLayout->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - this->Ui.gridLayout->setVerticalSpacing(pqPropertiesPanel::suggestedVerticalSpacing()); - this->Ui.gridLayout->setHorizontalSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); - -diff --git a/Qt/Components/pqFindDataSelectionDisplayFrame.cxx b/Qt/Components/pqFindDataSelectionDisplayFrame.cxx -index 79b60a34e..7a250d094 100644 ---- a/Qt/Components/pqFindDataSelectionDisplayFrame.cxx -+++ b/Qt/Components/pqFindDataSelectionDisplayFrame.cxx -@@ -79,7 +79,7 @@ public: - this->PointLabelsMenu.setObjectName("PointLabelsMenu"); - - this->Ui.setupUi(self); -- this->Ui.mainLayout->setMargin(pqPropertiesPanel::suggestedMargin()); -+ this->Ui.mainLayout->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - this->Ui.mainLayout->setSpacing(pqPropertiesPanel::suggestedVerticalSpacing()); - - this->Ui.cellLabelsButton->setMenu(&this->CellLabelsMenu); -diff --git a/Qt/Components/pqImageTip.cxx b/Qt/Components/pqImageTip.cxx -index 4626e2134..0213021e2 100644 ---- a/Qt/Components/pqImageTip.cxx -+++ b/Qt/Components/pqImageTip.cxx -@@ -38,7 +38,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include - #include - #include --#include - #include - #include - #include -@@ -138,7 +137,7 @@ bool pqImageTip::eventFilter(QObject*, QEvent* e) - return false; - } - --void pqImageTip::enterEvent(QEvent*) -+void pqImageTip::enterEvent(QEnterEvent *) - { - hide(); - } -@@ -153,7 +152,7 @@ void pqImageTip::paintEvent(QPaintEvent* ev) - { - QStylePainter p(this); - QStyleOptionFrame opt; -- opt.init(this); -+ this->initStyleOption(&opt); - p.drawPrimitive(QStyle::PE_PanelTipLabel, opt); - p.end(); - -diff --git a/Qt/Components/pqImageTip.h b/Qt/Components/pqImageTip.h -index d44f201d4..e10416f43 100644 ---- a/Qt/Components/pqImageTip.h -+++ b/Qt/Components/pqImageTip.h -@@ -60,7 +60,7 @@ private: - QBasicTimer* const hideTimer; - - bool eventFilter(QObject*, QEvent*) override; -- void enterEvent(QEvent*) override; -+ void enterEvent(QEnterEvent *) override; - void timerEvent(QTimerEvent* e) override; - void paintEvent(QPaintEvent* e) override; - }; -diff --git a/Qt/Components/pqIndexSelectionWidget.cxx b/Qt/Components/pqIndexSelectionWidget.cxx -index 9cae037d8..f274cd3c4 100644 ---- a/Qt/Components/pqIndexSelectionWidget.cxx -+++ b/Qt/Components/pqIndexSelectionWidget.cxx -@@ -116,7 +116,7 @@ Widgets::Widgets(pqIndexSelectionWidget* parent, const QString& key, int current - this->slider->setProperty(keyPropertyName, key); - this->edit->setProperty(keyPropertyName, key); - -- this->layout->setMargin(0); -+ this->layout->setContentsMargins(0,0,0,0); - this->layout->addWidget(this->slider); - this->layout->addWidget(this->edit); - -@@ -244,10 +244,10 @@ pqIndexSelectionWidget::pqIndexSelectionWidget( - - this->GroupBox->setAlignment(Qt::AlignLeft); - -- this->VBox->setMargin(pqPropertiesPanel::suggestedMargin()); -+ this->VBox->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - this->VBox->addWidget(this->GroupBox); - -- this->Form->setMargin(pqPropertiesPanel::suggestedMargin()); -+ this->Form->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - this->Form->setHorizontalSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); - this->Form->setLabelAlignment(Qt::AlignLeft); - -diff --git a/Qt/Components/pqInputSelectorWidget.cxx b/Qt/Components/pqInputSelectorWidget.cxx -index 8e13dd686..4049a1bb9 100644 ---- a/Qt/Components/pqInputSelectorWidget.cxx -+++ b/Qt/Components/pqInputSelectorWidget.cxx -@@ -96,7 +96,7 @@ pqInputSelectorWidget::pqInputSelectorWidget( - this->setProperty(smproperty); - - auto l = new QVBoxLayout(this); -- l->setMargin(pqPropertiesPanel::suggestedMargin()); -+ l->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - l->setSpacing(pqPropertiesPanel::suggestedVerticalSpacing()); - l->addWidget(this->ComboBox); - -diff --git a/Qt/Components/pqIntMaskPropertyWidget.cxx b/Qt/Components/pqIntMaskPropertyWidget.cxx -index e91a98f6f..335cee248 100644 ---- a/Qt/Components/pqIntMaskPropertyWidget.cxx -+++ b/Qt/Components/pqIntMaskPropertyWidget.cxx -@@ -51,7 +51,7 @@ public: - : Mask(0) - { - QHBoxLayout* hbox = new QHBoxLayout(self); -- hbox->setMargin(0); -+ hbox->setContentsMargins(0,0,0,0); - - this->Button = new QPushButton(self); - hbox->addWidget(this->Button); -diff --git a/Qt/Components/pqIntRangeWidget.cxx b/Qt/Components/pqIntRangeWidget.cxx -index b6f0e5d32..a8cf6289b 100644 ---- a/Qt/Components/pqIntRangeWidget.cxx -+++ b/Qt/Components/pqIntRangeWidget.cxx -@@ -57,7 +57,7 @@ pqIntRangeWidget::pqIntRangeWidget(QWidget* p) - this->DeferredValueEdited = false; - - QHBoxLayout* l = new QHBoxLayout(this); -- l->setMargin(0); -+ l->setContentsMargins(0,0,0,0); - this->Slider = new QSlider(Qt::Horizontal, this); - this->Slider->setRange(0, 1); - l->addWidget(this->Slider); -diff --git a/Qt/Components/pqIntVectorPropertyWidget.cxx b/Qt/Components/pqIntVectorPropertyWidget.cxx -index d54c5a304..7f783371e 100644 ---- a/Qt/Components/pqIntVectorPropertyWidget.cxx -+++ b/Qt/Components/pqIntVectorPropertyWidget.cxx -@@ -94,7 +94,7 @@ pqIntVectorPropertyWidget::pqIntVectorPropertyWidget( - } - - QHBoxLayout* layoutLocal = new QHBoxLayout; -- layoutLocal->setMargin(0); -+ layoutLocal->setContentsMargins(0,0,0,0); - - if (vtkSMBooleanDomain::SafeDownCast(domain)) - { -@@ -135,7 +135,7 @@ pqIntVectorPropertyWidget::pqIntVectorPropertyWidget( - treeWidget->setMaximumRowCountBeforeScrolling(smproperty); - - QTreeWidgetItem* header = new QTreeWidgetItem(); -- header->setData(0, Qt::DisplayRole, smproperty->GetXMLLabel()); -+ header->setData(0, Qt::DisplayRole, QString(smproperty->GetXMLLabel())); - treeWidget->setHeaderItem(header); - - // helper makes it easier to select multiple entries. -diff --git a/Qt/Components/pqKeyFrameEditor.cxx b/Qt/Components/pqKeyFrameEditor.cxx -index a2f59503a..d31cf6b4d 100644 ---- a/Qt/Components/pqKeyFrameEditor.cxx -+++ b/Qt/Components/pqKeyFrameEditor.cxx -@@ -103,7 +103,7 @@ public: - , Child(child) - { - QVBoxLayout* l = new QVBoxLayout(this); -- l->setMargin(0); -+ l->setContentsMargins(0,0,0,0); - l->addWidget(this->Child); - this->Child->show(); - } -@@ -156,7 +156,7 @@ public: - : CamWidget(&this->Widget) - { - QVBoxLayout* l = new QVBoxLayout(&this->Widget); -- l->setMargin(0); -+ l->setContentsMargins(0,0,0,0); - l->addWidget(&this->CamWidget); - } - -diff --git a/Qt/Components/pqLiveInsituManager.h b/Qt/Components/pqLiveInsituManager.h -index 30cd9f310..60376566f 100644 ---- a/Qt/Components/pqLiveInsituManager.h -+++ b/Qt/Components/pqLiveInsituManager.h -@@ -33,6 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #define pqLiveInsituManager_h - - #include "pqComponentsModule.h" -+#include - #include - #include - -diff --git a/Qt/Components/pqLogViewerDialog.cxx b/Qt/Components/pqLogViewerDialog.cxx -index 0eb023826..49f8f7618 100644 ---- a/Qt/Components/pqLogViewerDialog.cxx -+++ b/Qt/Components/pqLogViewerDialog.cxx -@@ -307,7 +307,7 @@ void pqLogViewerDialog::recordRefTimes() - this->LogRecorderProxies[i]->GatherInformation(refTimeInfo); - auto startingLog = QString::fromStdString(refTimeInfo->GetStartingLogs()); - bool isRawLog; -- auto parts = pqLogViewerWidget::extractLogParts(&startingLog, isRawLog); -+ auto parts = pqLogViewerWidget::extractLogParts(startingLog, isRawLog); - this->RefTimes[LogLocation(this->LogRecorderProxies[i], j)] = - parts[0].replace('s', '0').toDouble(); - } -diff --git a/Qt/Components/pqMultiViewWidget.cxx b/Qt/Components/pqMultiViewWidget.cxx -index 7a1bd1b22..c8dca2e92 100644 ---- a/Qt/Components/pqMultiViewWidget.cxx -+++ b/Qt/Components/pqMultiViewWidget.cxx -@@ -128,7 +128,7 @@ public: - }); - - QVBoxLayout* slayout = new QVBoxLayout(self); -- slayout->setMargin(0); -+ slayout->setContentsMargins(0,0,0,0); - slayout->addWidget(this->Container); - - this->PopoutPlaceholder.reset(new QWidget()); -@@ -907,7 +907,7 @@ bool pqMultiViewWidget::togglePopout() - Qt::WindowCloseButtonHint)); - internals.PopoutWindow->setObjectName("PopoutWindow"); - auto l = new QVBoxLayout(internals.PopoutWindow.data()); -- l->setMargin(0); -+ l->setContentsMargins(0,0,0,0); - internals.PopoutWindow->resize(this->size()); - } - -diff --git a/Qt/Components/pqPipelineTimeKeyFrameEditor.cxx b/Qt/Components/pqPipelineTimeKeyFrameEditor.cxx -index 6b8082312..a9a289cb4 100644 ---- a/Qt/Components/pqPipelineTimeKeyFrameEditor.cxx -+++ b/Qt/Components/pqPipelineTimeKeyFrameEditor.cxx -@@ -73,7 +73,7 @@ pqPipelineTimeKeyFrameEditor::pqPipelineTimeKeyFrameEditor( - this->Internal->Editor = - new pqKeyFrameEditor(scene, cue, QString(), this->Internal->Ui.container); - QHBoxLayout* l = new QHBoxLayout(this->Internal->Ui.container); -- l->setMargin(0); -+ l->setContentsMargins(0,0,0,0); - l->addWidget(this->Internal->Editor); - - connect(this, SIGNAL(accepted()), this, SLOT(writeKeyFrameData())); -diff --git a/Qt/Components/pqPluginTreeWidgetEventPlayer.cxx b/Qt/Components/pqPluginTreeWidgetEventPlayer.cxx -index 05f2db061..8c9a10929 100644 ---- a/Qt/Components/pqPluginTreeWidgetEventPlayer.cxx -+++ b/Qt/Components/pqPluginTreeWidgetEventPlayer.cxx -@@ -37,6 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - #include - #include -+#include - - //----------------------------------------------------------------------------- - pqPluginTreeWidgetEventPlayer::pqPluginTreeWidgetEventPlayer(QObject* parentObject) -diff --git a/Qt/Components/pqPopOutWidget.cxx b/Qt/Components/pqPopOutWidget.cxx -index 858fb3af9..f4deccc77 100644 ---- a/Qt/Components/pqPopOutWidget.cxx -+++ b/Qt/Components/pqPopOutWidget.cxx -@@ -76,7 +76,7 @@ pqPopOutWidget::pqPopOutWidget(QWidget* widgetToPopOut, const QString& dialogTit - { - this->Internals->Title = dialogTitle; - this->Internals->Layout = new QHBoxLayout(this); -- this->Internals->Layout->setMargin(0); -+ this->Internals->Layout->setContentsMargins(0,0,0,0); - this->Internals->Layout->setSpacing(0); - this->Internals->WidgetToPopOut = widgetToPopOut; - this->Internals->Layout->addWidget(this->Internals->WidgetToPopOut); -diff --git a/Qt/Components/pqPropertiesPanel.cxx b/Qt/Components/pqPropertiesPanel.cxx -index 757b8d7e1..ed5a948d4 100644 ---- a/Qt/Components/pqPropertiesPanel.cxx -+++ b/Qt/Components/pqPropertiesPanel.cxx -@@ -121,7 +121,7 @@ public: - - delete parentWdg->layout(); - QVBoxLayout* layout = new QVBoxLayout(parentWdg); -- layout->setMargin(0); -+ layout->setContentsMargins(0,0,0,0); - layout->setSpacing(0); - this->Panel->setObjectName("ProxyPanel"); - this->Panel->setParent(parentWdg); -diff --git a/Qt/Components/pqPropertyWidget.cxx b/Qt/Components/pqPropertyWidget.cxx -index 9d8d4c146..4dffa6c5d 100644 ---- a/Qt/Components/pqPropertyWidget.cxx -+++ b/Qt/Components/pqPropertyWidget.cxx -@@ -42,6 +42,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include "vtkSMDomain.h" - #include "vtkSMProperty.h" - -+#include -+ - //----------------------------------------------------------------------------- - pqPropertyWidget::pqPropertyWidget(vtkSMProxy* smProxy, QWidget* parentObject) - : QFrame(parentObject) -@@ -112,7 +114,7 @@ QString pqPropertyWidget::getTooltip(vtkSMProperty* smproperty) - { - QString doc = pqProxy::rstToHtml(smproperty->GetDocumentation()->GetDescription()).c_str(); - doc = doc.trimmed(); -- doc = doc.replace(QRegExp("\\s+"), " "); -+ doc = doc.replace(QRegularExpression("\\s+"), " "); - return QString("

%1

").arg(doc); - } - return QString(); -diff --git a/Qt/Components/pqProxiesWidget.cxx b/Qt/Components/pqProxiesWidget.cxx -index 82bb44167..88d7b25ae 100644 ---- a/Qt/Components/pqProxiesWidget.cxx -+++ b/Qt/Components/pqProxiesWidget.cxx -@@ -133,7 +133,7 @@ void pqProxiesWidget::updateLayout() - internals.clearExpanders(); - delete this->layout(); - QVBoxLayout* vbox = new QVBoxLayout(this); -- vbox->setMargin(0); -+ vbox->setContentsMargins(0,0,0,0); - vbox->setSpacing(pqPropertiesPanel::suggestedVerticalSpacing()); - - // Don't add expander buttons if there's only 1 component and that components -diff --git a/Qt/Components/pqProxyEditorPropertyWidget.cxx b/Qt/Components/pqProxyEditorPropertyWidget.cxx -index f72610b50..c81513f84 100644 ---- a/Qt/Components/pqProxyEditorPropertyWidget.cxx -+++ b/Qt/Components/pqProxyEditorPropertyWidget.cxx -@@ -71,7 +71,7 @@ pqProxyEditorPropertyWidget::pqProxyEditorPropertyWidget( - } - - QHBoxLayout* hbox = new QHBoxLayout(this); -- hbox->setMargin(0); -+ hbox->setContentsMargins(0,0,0,0); - hbox->setSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); - if (this->Checkbox) - { -diff --git a/Qt/Components/pqProxyPropertyWidget.cxx b/Qt/Components/pqProxyPropertyWidget.cxx -index 54daa99c3..6c348829c 100644 ---- a/Qt/Components/pqProxyPropertyWidget.cxx -+++ b/Qt/Components/pqProxyPropertyWidget.cxx -@@ -46,7 +46,7 @@ pqProxyPropertyWidget::pqProxyPropertyWidget( - : pqPropertyWidget(smProxy, parentObject) - { - QVBoxLayout* vbox = new QVBoxLayout; -- vbox->setMargin(0); -+ vbox->setContentsMargins(0,0,0,0); - vbox->setSpacing(0); - - bool selection_input = -diff --git a/Qt/Components/pqProxySelectionWidget.cxx b/Qt/Components/pqProxySelectionWidget.cxx -index cbab05d8c..8b12c9e74 100644 ---- a/Qt/Components/pqProxySelectionWidget.cxx -+++ b/Qt/Components/pqProxySelectionWidget.cxx -@@ -64,9 +64,9 @@ public: - { - this->Ui.setupUi(self); - this->Ui.verticalLayout->setSpacing(pqPropertiesPanel::suggestedVerticalSpacing()); -- this->Ui.verticalLayout->setMargin(pqPropertiesPanel::suggestedMargin()); -+ this->Ui.verticalLayout->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - this->Ui.horizontalLayout->setSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); -- this->Ui.horizontalLayout->setMargin(pqPropertiesPanel::suggestedMargin()); -+ this->Ui.horizontalLayout->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - this->Ui.frameLayout->setSpacing(pqPropertiesPanel::suggestedVerticalSpacing()); - } - -diff --git a/Qt/Components/pqProxyWidget.cxx b/Qt/Components/pqProxyWidget.cxx -index a3b722105..6f0adc74e 100644 ---- a/Qt/Components/pqProxyWidget.cxx -+++ b/Qt/Components/pqProxyWidget.cxx -@@ -700,7 +700,7 @@ pqProxyWidget::pqProxyWidget(vtkSMProxy* smproxy, const QStringList& properties, - this->connect(&internals.RequestUpdatePanel, SIGNAL(timeout()), SLOT(updatePanel())); - - QGridLayout* gridLayout = new QGridLayout(this); -- gridLayout->setMargin(pqPropertiesPanel::suggestedMargin()); -+ gridLayout->setContentsMargins(pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin(),pqPropertiesPanel::suggestedMargin()); - gridLayout->setHorizontalSpacing(pqPropertiesPanel::suggestedHorizontalSpacing()); - gridLayout->setVerticalSpacing(pqPropertiesPanel::suggestedVerticalSpacing()); - -diff --git a/Qt/Components/pqServerLauncher.cxx b/Qt/Components/pqServerLauncher.cxx -index e6fb5d542..9cd23a21e 100644 ---- a/Qt/Components/pqServerLauncher.cxx -+++ b/Qt/Components/pqServerLauncher.cxx -@@ -66,6 +66,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include - #include - #include -+#include - - #include - -diff --git a/Qt/Components/pqSettingsDialog.cxx b/Qt/Components/pqSettingsDialog.cxx -index 768a33c76..99c7b66c6 100644 ---- a/Qt/Components/pqSettingsDialog.cxx -+++ b/Qt/Components/pqSettingsDialog.cxx -@@ -134,7 +134,7 @@ pqSettingsDialog::pqSettingsDialog( - container->setContentsMargins(6, 0, 6, 0); - - QVBoxLayout* vbox = new QVBoxLayout(container); -- vbox->setMargin(0); -+ vbox->setContentsMargins(0,0,0,0); - vbox->setSpacing(0); - - pqProxyWidget* widget = new pqProxyWidget(proxy, container); -diff --git a/Qt/Components/pqShaderReplacementsSelectorPropertyWidget.cxx b/Qt/Components/pqShaderReplacementsSelectorPropertyWidget.cxx -index 33b7588b3..f90e3c781 100644 ---- a/Qt/Components/pqShaderReplacementsSelectorPropertyWidget.cxx -+++ b/Qt/Components/pqShaderReplacementsSelectorPropertyWidget.cxx -@@ -78,7 +78,7 @@ pqShaderReplacementsSelectorPropertyWidget::pqShaderReplacementsSelectorProperty - this->Internal = new pqInternal(vtkSMStringVectorProperty::SafeDownCast(smProperty)); - - QVBoxLayout* l = new QVBoxLayout; -- l->setMargin(0); -+ l->setContentsMargins(0,0,0,0); - - QGridLayout* gridLayout = new QGridLayout; - gridLayout->setColumnStretch(0, 0); -diff --git a/Qt/Components/pqStringVectorPropertyWidget.cxx b/Qt/Components/pqStringVectorPropertyWidget.cxx -index 44efe7560..903488705 100644 ---- a/Qt/Components/pqStringVectorPropertyWidget.cxx -+++ b/Qt/Components/pqStringVectorPropertyWidget.cxx -@@ -77,7 +77,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include - #include - #include --#include -+#include - #include - #include - #include -@@ -159,7 +159,7 @@ pqStringVectorPropertyWidget::pqStringVectorPropertyWidget( - domainIter->Delete(); - - QVBoxLayout* vbox = new QVBoxLayout; -- vbox->setMargin(0); -+ vbox->setContentsMargins(0,0,0,0); - vbox->setSpacing(0); - - if (fileListDomain) -@@ -313,7 +313,7 @@ pqStringVectorPropertyWidget::pqStringVectorPropertyWidget( - - QWidget* w = new QWidget(this); - QHBoxLayout* hbox = new QHBoxLayout(this); -- hbox->setMargin(0); -+ hbox->setContentsMargins(0,0,0,0); - hbox->setSpacing(0); - QLabel* label = new QLabel(smProperty->GetXMLLabel(), w); - hbox->addWidget(label); -@@ -489,7 +489,7 @@ void pqStringVectorPropertyWidget::processFileChooserHints(vtkPVXMLElement* hint - else - { - QStringList lextensions = -- QString(extensions).split(QRegExp("\\s+"), PV_QT_SKIP_EMPTY_PARTS); -+ QString(extensions).split(QRegularExpression("\\s+"), PV_QT_SKIP_EMPTY_PARTS); - supportedExtensions.push_back( - QString("%1 (*.%2)").arg(file_description).arg(lextensions.join(" *."))); - } -diff --git a/Qt/Components/pqTabbedMultiViewWidget.cxx b/Qt/Components/pqTabbedMultiViewWidget.cxx -index b1a2eec94..a371fa676 100644 ---- a/Qt/Components/pqTabbedMultiViewWidget.cxx -+++ b/Qt/Components/pqTabbedMultiViewWidget.cxx -@@ -459,7 +459,7 @@ pqTabbedMultiViewWidget::pqTabbedMultiViewWidget(QWidget* parentObject) - this, SLOT(contextMenuRequested(const QPoint&))); - - QGridLayout* glayout = new QGridLayout(this); -- glayout->setMargin(0); -+ glayout->setContentsMargins(0,0,0,0); - glayout->setSpacing(0); - glayout->addWidget(this->Internals->TabWidget, 0, 0); - -@@ -544,7 +544,7 @@ void pqTabbedMultiViewWidget::toggleFullScreen() - - QGridLayout* glayout = new QGridLayout(fullScreenWindow); - glayout->setSpacing(0); -- glayout->setMargin(0); -+ glayout->setContentsMargins(0,0,0,0); - glayout->addWidget(internals.TabWidget, 0, 0); - fullScreenWindow->showFullScreen(); - fullScreenWindow->show(); -diff --git a/Qt/Components/pqTextureSelectorPropertyWidget.cxx b/Qt/Components/pqTextureSelectorPropertyWidget.cxx -index d0b0a5e37..94f73c2f3 100644 ---- a/Qt/Components/pqTextureSelectorPropertyWidget.cxx -+++ b/Qt/Components/pqTextureSelectorPropertyWidget.cxx -@@ -60,7 +60,7 @@ pqTextureSelectorPropertyWidget::pqTextureSelectorPropertyWidget( - this->setToolTip("Select/Load texture to apply."); - - QVBoxLayout* l = new QVBoxLayout; -- l->setMargin(0); -+ l->setContentsMargins(0,0,0,0); - - // Create the combobox selector and set its value - auto* domain = smProperty->FindDomain(); -diff --git a/Qt/Components/pqTransferFunction2DWidget.cxx b/Qt/Components/pqTransferFunction2DWidget.cxx -index f5427eede..4a74ded94 100644 ---- a/Qt/Components/pqTransferFunction2DWidget.cxx -+++ b/Qt/Components/pqTransferFunction2DWidget.cxx -@@ -88,7 +88,7 @@ public: - - this->Widget->setParent(editor); - QVBoxLayout* layout = new QVBoxLayout(editor); -- layout->setMargin(0); -+ layout->setContentsMargins(0,0,0,0); - layout->addWidget(this->Widget); - - this->Chart->SetAutoSize(true); -diff --git a/Qt/Components/pqTransferFunctionWidget.cxx b/Qt/Components/pqTransferFunctionWidget.cxx -index 64958588a..1b1e5ee0e 100644 ---- a/Qt/Components/pqTransferFunctionWidget.cxx -+++ b/Qt/Components/pqTransferFunctionWidget.cxx -@@ -246,7 +246,7 @@ public: - - this->Widget->setParent(editor); - QVBoxLayout* layout = new QVBoxLayout(editor); -- layout->setMargin(0); -+ layout->setContentsMargins(0,0,0,0); - layout->addWidget(this->Widget); - - this->ChartXY->SetAutoAxes(false); -diff --git a/Qt/Core/CMakeLists.txt b/Qt/Core/CMakeLists.txt -index ae1b8bd36..dcaa7471d 100644 ---- a/Qt/Core/CMakeLists.txt -+++ b/Qt/Core/CMakeLists.txt -@@ -166,7 +166,7 @@ if (PARAVIEW_USE_PYTHON) - endif () - - set(qt_components -- Widgets) -+ Widgets Core5Compat) - - if (PARAVIEW_USE_QTHELP) - list(APPEND qt_components -@@ -174,9 +174,9 @@ if (PARAVIEW_USE_QTHELP) - endif () - - vtk_module_find_package( -- PACKAGE Qt5 -+ PACKAGE Qt${VTK_QT_VERSION} - COMPONENTS ${qt_components} -- VERSION 5.12 -+ VERSION 6.2 - FORWARD_VERSION_REQ MINOR) - - set(CMAKE_AUTOMOC 1) -@@ -195,11 +195,11 @@ vtk_module_add_module(ParaView::pqCore - HEADERS ${headers}) - vtk_module_link(ParaView::pqCore - PRIVATE -- Qt5::Widgets) -+ Qt${VTK_QT_VERSION}::Widgets Qt${VTK_QT_VERSION}::Core5Compat) - if (PARAVIEW_USE_QTHELP) - vtk_module_link(ParaView::pqCore - PRIVATE -- Qt5::Help) -+ Qt${VTK_QT_VERSION}::Help) - endif () - vtk_module_definitions(ParaView::pqCore PRIVATE QT_NO_KEYWORDS) - -diff --git a/Qt/Core/Testing/Cxx/CMakeLists.txt b/Qt/Core/Testing/Cxx/CMakeLists.txt -index 7518832d8..f75e7267c 100644 ---- a/Qt/Core/Testing/Cxx/CMakeLists.txt -+++ b/Qt/Core/Testing/Cxx/CMakeLists.txt -@@ -1,7 +1,7 @@ --find_package(Qt5 REQUIRED COMPONENTS Core Widgets Test) -+find_package(Qt${VTK_QT_VERSION} REQUIRED COMPONENTS Core Widgets Test) - set(CMAKE_AUTOMOC 1) - vtk_module_test_executable(pqCoreBasicApp BasicApp.cxx BasicApp.h) --target_link_libraries(pqCoreBasicApp PRIVATE Qt5::Core Qt5::Widgets) -+target_link_libraries(pqCoreBasicApp PRIVATE Qt${VTK_QT_VERSION}::Core Qt${VTK_QT_VERSION}::Widgets) - ExternalData_add_test("${_vtk_build_TEST_DATA_TARGET}" - NAME pqCoreBasicApp - COMMAND pqCoreBasicApp -@@ -24,7 +24,7 @@ set(MocSources - create_test_sourcelist(Tests pqCoreTest.cxx ${MyTests}) - - vtk_module_test_executable(pqCoreTest ${Tests}) --target_link_libraries(pqCoreTest PRIVATE Qt5::Core Qt5::Widgets Qt5::Test) -+target_link_libraries(pqCoreTest PRIVATE Qt${VTK_QT_VERSION}::Core Qt${VTK_QT_VERSION}::Widgets Qt${VTK_QT_VERSION}::Test) - - foreach(test_file ${MyTests}) - get_filename_component(test "${test_file}" NAME_WE) -diff --git a/Qt/Core/Testing/Cxx/KeySequences.cxx b/Qt/Core/Testing/Cxx/KeySequences.cxx -index c59c4b6c4..127ef21da 100644 ---- a/Qt/Core/Testing/Cxx/KeySequences.cxx -+++ b/Qt/Core/Testing/Cxx/KeySequences.cxx -@@ -69,7 +69,7 @@ KeySequencesWidget::KeySequencesWidget(const std::string& label, const std::stri - auto* hl = new QHBoxLayout(this); - hl->addWidget(m_label); - hl->addWidget(m_button); -- hl->setMargin(1); -+ hl->setContentsMargins(1,1,1,1); - m_shortcut = pqKeySequences::instance().addModalShortcut(shortcut, m_action, this); - m_shortcut->setObjectName(label.c_str()); - QObject::connect( -@@ -203,7 +203,7 @@ void KeySequencesTester::basic() - auto* widget = new QWidget(window); - window->setCentralWidget(widget); - auto* layout = new QVBoxLayout(widget); -- layout->setMargin(1); -+ layout->setContentsMargins(1,1,1,1); - layout->setSpacing(1); - - auto* w1 = new KeySequencesWidget("Thing 1", "1", QKeySequence(tr("Ctrl+A")), widget); -diff --git a/Qt/Core/Testing/Python/CMakeLists.txt b/Qt/Core/Testing/Python/CMakeLists.txt -index f7d6e6262..46f4b57fd 100644 ---- a/Qt/Core/Testing/Python/CMakeLists.txt -+++ b/Qt/Core/Testing/Python/CMakeLists.txt -@@ -1,8 +1,8 @@ --find_package(Qt5 REQUIRED QUIET COMPONENTS Core Widgets) -+find_package(Qt${VTK_QT_VERSION} REQUIRED QUIET COMPONENTS Core Widgets) - set(CMAKE_AUTOMOC 1) - vtk_module_test_executable(pqFileDialogTest - pqFileDialogTest.cxx pqFileDialogTest.h) --target_link_libraries(pqFileDialogTest LINK_PRIVATE Qt5::Core Qt5::Widgets) -+target_link_libraries(pqFileDialogTest LINK_PRIVATE Qt${VTK_QT_VERSION}::Core Qt${VTK_QT_VERSION}::Widgets) - - add_test( - NAME pqFileDialogTest -diff --git a/Qt/Core/pqAnnotationsModel.cxx b/Qt/Core/pqAnnotationsModel.cxx -index c00bd5df3..69b2a0dac 100644 ---- a/Qt/Core/pqAnnotationsModel.cxx -+++ b/Qt/Core/pqAnnotationsModel.cxx -@@ -34,6 +34,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include - #include - #include -+#include - - #include "vtkSMStringListDomain.h" - -diff --git a/Qt/Core/pqApplicationCore.cxx b/Qt/Core/pqApplicationCore.cxx -index b63cd8ae4..3388d884e 100644 ---- a/Qt/Core/pqApplicationCore.cxx -+++ b/Qt/Core/pqApplicationCore.cxx -@@ -49,6 +49,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include - #include - #include -+#include - - // ParaView includes. - #include "pqAnimationScene.h" -@@ -506,7 +507,7 @@ void pqApplicationCore::onStateSaved(vtkPVXMLElement* root) - if (!QApplication::applicationName().isEmpty()) - { - // Change root element to match the application name. -- QString valid_name = QApplication::applicationName().replace(QRegExp("\\W"), "_"); -+ QString valid_name = QApplication::applicationName().replace(QRegularExpression("\\W"), "_"); - root->SetName(valid_name.toUtf8().data()); - } - Q_EMIT this->stateSaved(root); -diff --git a/Qt/Core/pqApplicationCore.h b/Qt/Core/pqApplicationCore.h -index d8d594fcb..784551dbd 100644 ---- a/Qt/Core/pqApplicationCore.h -+++ b/Qt/Core/pqApplicationCore.h -@@ -37,6 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include "vtkSmartPointer.h" // for vtkSmartPointer - #include - #include -+#include - #include // for std::exception - - class pqInterfaceTracker; -@@ -58,7 +59,6 @@ class pqTestUtility; - class pqUndoStack; - class QApplication; - class QHelpEngine; --class QStringList; - class vtkPVXMLElement; - class vtkSMProxyLocator; - class vtkSMStateLoader; -diff --git a/Qt/Core/pqComparativeContextView.cxx b/Qt/Core/pqComparativeContextView.cxx -index 8b05173b9..7b66cb9cc 100644 ---- a/Qt/Core/pqComparativeContextView.cxx -+++ b/Qt/Core/pqComparativeContextView.cxx -@@ -206,7 +206,7 @@ void pqComparativeContextView::updateViewWidgets() - QGridLayout* layout = new QGridLayout(wdg); - layout->setHorizontalSpacing(vtkSMPropertyHelper(compView, "Spacing").GetAsInt(0)); - layout->setVerticalSpacing(vtkSMPropertyHelper(compView, "Spacing").GetAsInt(1)); -- layout->setMargin(0); -+ layout->setContentsMargins(0,0,0,0); - for (int x = 0; x < dimensions[0]; ++x) - { - for (int y = 0; y < dimensions[1]; ++y) -diff --git a/Qt/Core/pqComparativeRenderView.cxx b/Qt/Core/pqComparativeRenderView.cxx -index 6500f0f8a..2fcc8deb0 100644 ---- a/Qt/Core/pqComparativeRenderView.cxx -+++ b/Qt/Core/pqComparativeRenderView.cxx -@@ -194,7 +194,7 @@ void pqComparativeRenderView::updateViewWidgets(QWidget* container /*=nullptr*/) - QGridLayout* layout = new QGridLayout(container); - layout->setHorizontalSpacing(vtkSMPropertyHelper(compView, "Spacing").GetAsInt(0)); - layout->setVerticalSpacing(vtkSMPropertyHelper(compView, "Spacing").GetAsInt(1)); -- layout->setMargin(0); -+ layout->setContentsMargins(0,0,0,0); - for (int x = 0; x < dimensions[0]; x++) - { - for (int y = 0; y < dimensions[1]; y++) -diff --git a/Qt/Core/pqFileDialog.cxx b/Qt/Core/pqFileDialog.cxx -index 715d97327..5d23d34e0 100644 ---- a/Qt/Core/pqFileDialog.cxx -+++ b/Qt/Core/pqFileDialog.cxx -@@ -54,6 +54,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include - #include - #include -+#include - - #include - #include -@@ -113,7 +114,7 @@ QStringList GetWildCardsFromFilter(const QString& filter) - } - - // separated by spaces or semi-colons -- QStringList fs = f.split(QRegExp("[\\s+;]"), PV_QT_SKIP_EMPTY_PARTS); -+ QStringList fs = f.split(QRegularExpression("[\\s+;]"), PV_QT_SKIP_EMPTY_PARTS); - - // add a *.ext.* for every *.ext we get to support file groups - QStringList ret = fs; -@@ -626,7 +627,7 @@ void pqFileDialog::RemoveDirectoryFromFavorites(QString const& directory) - //----------------------------------------------------------------------------- - void pqFileDialog::FilterDirectoryFromFavorites(const QString& filter) - { -- this->Implementation->proxyFavoriteModel->setFilterRegExp(filter); -+ this->Implementation->proxyFavoriteModel->setFilterRegularExpression(filter); - } - - //----------------------------------------------------------------------------- -diff --git a/Qt/Core/pqFileDialogFilter.cxx b/Qt/Core/pqFileDialogFilter.cxx -index 9acdb2bb1..4daeea158 100644 ---- a/Qt/Core/pqFileDialogFilter.cxx -+++ b/Qt/Core/pqFileDialogFilter.cxx -@@ -36,6 +36,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include - #include - #include -+#include - - #include "pqFileDialogModel.h" - -@@ -75,7 +76,7 @@ void pqFileDialogFilter::setFilter(const QString& filter) - f = f.trimmed(); - - // convert all spaces into | -- f.replace(QRegExp("[\\s+;]+"), "|"); -+ f.replace(QRegularExpression ("[\\s+;]+"), "|"); - - QStringList strings = f.split("|"); - QStringList extensions_list, filepatterns_list; -diff --git a/Qt/Core/pqFileDialogModel.cxx b/Qt/Core/pqFileDialogModel.cxx -index 95f6c31e6..f6b909f6f 100644 ---- a/Qt/Core/pqFileDialogModel.cxx -+++ b/Qt/Core/pqFileDialogModel.cxx -@@ -150,12 +150,12 @@ public: - QString modificationTimeString() const - { - return QLocale::system().toString( -- QDateTime::fromTime_t(this->ModificationTime), QLocale::ShortFormat); -+ QDateTime::fromSecsSinceEpoch(this->ModificationTime), QLocale::ShortFormat); - } - - qulonglong size() const { return static_cast(this->Size); } - -- QDateTime modificationTime() const { return QDateTime::fromTime_t(this->ModificationTime); } -+ QDateTime modificationTime() const { return QDateTime::fromSecsSinceEpoch(this->ModificationTime); } - - private: - QString Label; -diff --git a/Qt/Core/pqLogViewerWidget.cxx b/Qt/Core/pqLogViewerWidget.cxx -index 644e70077..480e61b77 100644 ---- a/Qt/Core/pqLogViewerWidget.cxx -+++ b/Qt/Core/pqLogViewerWidget.cxx -@@ -41,6 +41,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include - #include - #include -+#include - #include - - #include "pqCoreUtilities.h" -@@ -71,7 +72,7 @@ public: - this->Ui.details->setText(tr("")); - } - -- void addLines(const QVector& lines) -+ void addLines(const QStringList& lines) - { - QRegularExpression scopeBegin(R"==(^\s*{ (?