cMake: Add support for compiling against Qt6 (#7647)

Removes the BUILD_QT5 flag and adds a new FREECAD_QT_VERSION option, which can be set to either "Auto" (default), 5, or 6. Auto detects which version of Qt is installed on the system and chooses it. If both version are installed, Qt5 is used. Note that this DOES NOT implement compiling against Qt6, it only adds the necessary cMake infrastructure to begin work on the source code changes that will be required.
2022-10-31 09:24:09 -05:00
parent b64d987ac1
commit 1fac3fead0
37 changed files with 595 additions and 662 deletions
--- a/src/Mod/Drawing/Gui/CMakeLists.txt
+++ b/src/Mod/Drawing/Gui/CMakeLists.txt
@@ -26,13 +26,8 @@ set(DrawingGui_UIC_SRCS
    TaskOrthoViews.ui
 )

-if(BUILD_QT5)
-    qt5_add_resources(DrawingGui_SRCS Resources/Drawing.qrc)
-    qt5_wrap_ui(DrawingGui_UIC_HDRS ${DrawingGui_UIC_SRCS})
-else()
-    qt4_add_resources(DrawingGui_SRCS Resources/Drawing.qrc)
-    qt4_wrap_ui(DrawingGui_UIC_HDRS ${DrawingGui_UIC_SRCS})
-endif()
+qt_add_resources(DrawingGui_SRCS Resources/Drawing.qrc)
+qt_wrap_ui(DrawingGui_UIC_HDRS ${DrawingGui_UIC_SRCS})

 SET(DrawingGui_SRCS
    ${DrawingGui_SRCS}
--- a/src/Mod/Fem/Gui/CMakeLists.txt
+++ b/src/Mod/Fem/Gui/CMakeLists.txt
@@ -103,14 +103,6 @@ if(BUILD_FEM_VTK)
    )
 endif(BUILD_FEM_VTK)

-
-if(BUILD_QT5)
-    qt5_wrap_ui(FemGui_UIC_HDRS ${FemGui_UIC_SRCS})
-else()
-    qt4_wrap_ui(FemGui_UIC_HDRS ${FemGui_UIC_SRCS})
-endif()
-
-
 SET(FemGui_DLG_SRCS
    ${FemGui_UIC_HDRS}
    DlgSettingsFemCcx.ui
@@ -191,12 +183,7 @@ SET(FemGui_DLG_SRCS
 )
 SOURCE_GROUP("Constraint-Dialogs" FILES ${FemGui_DLG_SRCS})

-
-if(BUILD_QT5)
-    qt5_add_resources(FemResource_SRCS Resources/Fem.qrc)
-else()
-    qt4_add_resources(FemResource_SRCS Resources/Fem.qrc)
-endif()
+qt_add_resources(FemResource_SRCS Resources/Fem.qrc)
 SOURCE_GROUP("Resources" FILES ${FemResource_SRCS})


--- a/src/Mod/Image/Gui/CMakeLists.txt
+++ b/src/Mod/Image/Gui/CMakeLists.txt
@@ -35,13 +35,7 @@ set(ImageGui_UIC_SRCS
    ImageOrientationDialog.ui
 )

-if(BUILD_QT5)
-    qt5_add_resources(ImageGui_QRC_SRCS ${ImageGui_RES_SRCS})
-    qt5_wrap_ui(ImageGui_UIC_HDRS ${ImageGui_UIC_SRCS})
-else()
-    qt4_add_resources(ImageGui_QRC_SRCS ${ImageGui_RES_SRCS})
-    qt4_wrap_ui(ImageGui_UIC_HDRS ${ImageGui_UIC_SRCS})
-endif()
+qt_add_resources(ImageGui_QRC_SRCS ${ImageGui_RES_SRCS})

 SET(ImageGui_SRCS
    ${ImageGui_QRC_SRCS}
--- a/src/Mod/Inspection/Gui/CMakeLists.txt
+++ b/src/Mod/Inspection/Gui/CMakeLists.txt
@@ -19,13 +19,7 @@ set(Dialogs_UIC_SRCS
    VisualInspection.ui
 )

-if(BUILD_QT5)
-    qt5_add_resources(Inspection_QRC_SRCS Resources/Inspection.qrc)
-    qt5_wrap_ui(Dialogs_UIC_HDRS ${Dialogs_UIC_SRCS})
-else()
-    qt4_add_resources(Inspection_QRC_SRCS Resources/Inspection.qrc)
-    qt4_wrap_ui(Dialogs_UIC_HDRS ${Dialogs_UIC_SRCS})
-endif()
+qt_add_resources(Inspection_QRC_SRCS Resources/Inspection.qrc)

 SET(Dialogs_SRCS
    ${Dialogs_UIC_HDRS}
--- a/src/Mod/Mesh/App/CMakeLists.txt
+++ b/src/Mod/Mesh/App/CMakeLists.txt
@@ -19,14 +19,12 @@ set(Mesh_LIBS
    FreeCADApp
 )

-if (BUILD_QT5)
-    include_directories(
-        ${Qt5Concurrent_INCLUDE_DIRS}
-    )
-    list(APPEND Mesh_LIBS
-        ${Qt5Concurrent_LIBRARIES}
-    )
-endif()
+include_directories(
+    ${QtConcurrent_INCLUDE_DIRS}
+)
+list(APPEND Mesh_LIBS
+    ${QtConcurrent_LIBRARIES}
+)

 generate_from_xml(EdgePy)
 generate_from_xml(FacetPy)
--- a/src/Mod/Mesh/Gui/CMakeLists.txt
+++ b/src/Mod/Mesh/Gui/CMakeLists.txt
@@ -94,13 +94,7 @@ SET(Inventor_SRCS
 )
 SOURCE_GROUP("Inventor" FILES ${Inventor_SRCS})

-if (BUILD_QT5)
-    qt5_wrap_ui(Dialogs_UIC_HDRS ${Dialogs_UIC_SRCS})
-    qt5_add_resources(resource_SRCS Resources/Mesh.qrc)
-else()
-    qt4_wrap_ui(Dialogs_UIC_HDRS ${Dialogs_UIC_SRCS})
-    qt4_add_resources(resource_SRCS Resources/Mesh.qrc)
-endif()
+qt_add_resources(resource_SRCS Resources/Mesh.qrc)

 SET(resource_SRCS
    ${resource_SRCS}
--- a/src/Mod/MeshPart/Gui/CMakeLists.txt
+++ b/src/Mod/MeshPart/Gui/CMakeLists.txt
@@ -39,13 +39,7 @@ set(MeshPartGui_UIC_SRCS
    Tessellation.ui
 )

-if(BUILD_QT5)
-    qt5_add_resources(MeshPartGui_QRC_SRCS Resources/MeshPart.qrc)
-    qt5_wrap_ui(MeshPartGui_UIC_HDRS ${MeshPartGui_UIC_SRCS})
-else()
-    qt4_add_resources(MeshPartGui_QRC_SRCS Resources/MeshPart.qrc)
-    qt4_wrap_ui(MeshPartGui_UIC_HDRS ${MeshPartGui_UIC_SRCS})
-endif()
+qt_add_resources(MeshPartGui_QRC_SRCS Resources/MeshPart.qrc)

 SET(MeshPartGui_SRCS
    ${MeshPartGui_QRC_SRCS}
--- a/src/Mod/Part/Gui/CMakeLists.txt
+++ b/src/Mod/Part/Gui/CMakeLists.txt
@@ -29,20 +29,14 @@ if(MSVC)
    )
 endif(MSVC)

-if (BUILD_QT5)
-    include_directories(
-        ${Qt5Concurrent_INCLUDE_DIRS}
-    )
-    list(APPEND PartGui_LIBS
-        ${Qt5Concurrent_LIBRARIES}
-    )
-endif()
+include_directories(
+    ${QtConcurrent_INCLUDE_DIRS}
+)
+list(APPEND PartGui_LIBS
+    ${QtConcurrent_LIBRARIES}
+)

-if (BUILD_QT5)
-    qt5_add_resources(PartGui_QRC_SRCS Resources/Part.qrc)
-else()
-    qt4_add_resources(PartGui_QRC_SRCS Resources/Part.qrc)
-endif()
+qt_add_resources(PartGui_QRC_SRCS Resources/Part.qrc)

 set(PartGui_UIC_SRCS
    CrossSections.ui
@@ -76,12 +70,6 @@ set(PartGui_UIC_SRCS
    TaskAttacher.ui
 )

-if (BUILD_QT5)
-    qt5_wrap_ui(PartGui_UIC_HDRS ${PartGui_UIC_SRCS})
-else()
-    qt4_wrap_ui(PartGui_UIC_HDRS ${PartGui_UIC_SRCS})
-endif()
-
 SET(PartGui_SRCS
    ${PartGui_QRC_SRCS}
    ${PartGui_UIC_HDRS}
--- a/src/Mod/PartDesign/Gui/CMakeLists.txt
+++ b/src/Mod/PartDesign/Gui/CMakeLists.txt
@@ -29,11 +29,7 @@ set(PartDesignGui_LIBS
    FreeCADGui
 )

-if(BUILD_QT5)
-    qt5_add_resources(PartDesignGui_SRCS Resources/PartDesign.qrc)
-else()
-    qt4_add_resources(PartDesignGui_SRCS Resources/PartDesign.qrc)
-endif()
+qt_add_resources(PartDesignGui_SRCS Resources/PartDesign.qrc)

 set(PartDesignGui_UIC_SRCS
    TaskFeaturePick.ui
@@ -62,12 +58,6 @@ set(PartDesignGui_UIC_SRCS
    TaskHelixParameters.ui
 )

-if(BUILD_QT5)
-    qt5_wrap_ui(PartDesignGui_UIC_HDRS ${PartDesignGui_UIC_SRCS})
-else()
-    qt4_wrap_ui(PartDesignGui_UIC_HDRS ${PartDesignGui_UIC_SRCS})
-endif()
-
 SET(PartDesignGuiViewProvider_SRCS
    ViewProvider.cpp
    ViewProvider.h
--- a/src/Mod/Path/Gui/CMakeLists.txt
+++ b/src/Mod/Path/Gui/CMakeLists.txt
@@ -25,11 +25,7 @@ set(PathGui_LIBS
    FreeCADGui
 )

-if(BUILD_QT5)
-    qt5_add_resources(PathResource_SRCS Resources/Path.qrc)
-else()
-    qt4_add_resources(PathResource_SRCS Resources/Path.qrc)
-endif()
+qt_add_resources(PathResource_SRCS Resources/Path.qrc)

 SOURCE_GROUP("Resources" FILES ${PathResource_SRCS})

@@ -39,12 +35,6 @@ set(PathGui_UIC_SRCS
    DlgProcessorChooser.ui
 )

-if(BUILD_QT5)
-    qt5_wrap_ui(PathGui_UIC_HDRS ${PathGui_UIC_SRCS})
-else()
-    qt4_wrap_ui(PathGui_UIC_HDRS ${PathGui_UIC_SRCS})
-endif()
-
 SET(PathGui_SRCS_Module
    Command.cpp
    AppPathGui.cpp
--- a/src/Mod/Points/App/CMakeLists.txt
+++ b/src/Mod/Points/App/CMakeLists.txt
@@ -18,18 +18,12 @@ set(Points_LIBS
    FreeCADApp
 )

-if (BUILD_QT5)
-    include_directories(
-        ${Qt5Concurrent_INCLUDE_DIRS}
-    )
-    list(APPEND Points_LIBS
-        ${Qt5Concurrent_LIBRARIES}
-    )
-else()
-    include_directories(
-        ${QT_QTCORE_INCLUDE_DIR}
-    )
-endif()
+include_directories(
+    ${QtConcurrent_INCLUDE_DIRS}
+)
+list(APPEND Points_LIBS
+    ${QtConcurrent_LIBRARIES}
+)

 generate_from_xml(PointsPy)

--- a/src/Mod/Points/Gui/CMakeLists.txt
+++ b/src/Mod/Points/Gui/CMakeLists.txt
@@ -17,12 +17,6 @@ set(Dialog_UIC_SRCS
    DlgPointsRead.ui
 )

-if (BUILD_QT5)
-    qt5_wrap_ui(Dialogs_UIC_HDRS ${Dialog_UIC_SRCS})
-else()
-    qt4_wrap_ui(Dialogs_UIC_HDRS ${Dialog_UIC_SRCS})
-endif()
-
 SET(Dialogs_SRCS
    ${Dialogs_UIC_HDRS}
    DlgPointsRead.ui
@@ -31,11 +25,7 @@ SET(Dialogs_SRCS
 )
 SOURCE_GROUP("Dialogs" FILES ${Dialogs_SRCS})

-if (BUILD_QT5)
-    qt5_add_resources(Resource_SRCS Resources/Points.qrc)
-else()
-    qt4_add_resources(Resource_SRCS Resources/Points.qrc)
-endif()
+qt_add_resources(Resource_SRCS Resources/Points.qrc)

 SET(Resource_SRCS
    ${Resource_SRCS}
--- a/src/Mod/Raytracing/Gui/CMakeLists.txt
+++ b/src/Mod/Raytracing/Gui/CMakeLists.txt
@@ -46,13 +46,7 @@ set(RaytracingGui_UIC_SRCS
    DlgSettingsRay.ui
 )

-if (BUILD_QT5)
-    qt5_add_resources(Resource_SRCS Resources/Raytracing.qrc)
-    qt5_wrap_ui(RaytracingGui_UIC_HDRS ${RaytracingGui_UIC_SRCS})
-else()
-    qt4_add_resources(Resource_SRCS Resources/Raytracing.qrc)
-    qt4_wrap_ui(RaytracingGui_UIC_HDRS ${RaytracingGui_UIC_SRCS})
-endif()
+qt_add_resources(Resource_SRCS Resources/Raytracing.qrc)

 SET(RaytracingGui_SRCS
    ${Resource_SRCS}
--- a/src/Mod/ReverseEngineering/Gui/CMakeLists.txt
+++ b/src/Mod/ReverseEngineering/Gui/CMakeLists.txt
@@ -22,11 +22,7 @@ set(ReenGui_LIBS
    MeshGui
 )

-if(BUILD_QT5)
-    qt5_add_resources(ReenGui_QRC_SRCS Resources/ReverseEngineering.qrc)
-else()
-    qt4_add_resources(ReenGui_QRC_SRCS Resources/ReverseEngineering.qrc)
-endif()
+qt_add_resources(ReenGui_QRC_SRCS Resources/ReverseEngineering.qrc)

 set(Dialogs_UIC_SRCS
    FitBSplineSurface.ui
@@ -35,12 +31,6 @@ set(Dialogs_UIC_SRCS
    SegmentationManual.ui
 )

-if(BUILD_QT5)
-    qt5_wrap_ui(Dialogs_UIC_HDRS ${Dialogs_UIC_SRCS})
-else()
-    qt4_wrap_ui(Dialogs_UIC_HDRS ${Dialogs_UIC_SRCS})
-endif()
-
 SET(Dialogs_SRCS
    ${Dialogs_UIC_HDRS}
    ${Dialogs_UIC_SRCS}
--- a/src/Mod/Robot/Gui/CMakeLists.txt
+++ b/src/Mod/Robot/Gui/CMakeLists.txt
@@ -25,12 +25,7 @@ set(RobotGui_LIBS
    FreeCADGui
 )

-if(BUILD_QT5)
-    qt5_add_resources(RobotResource_SRCS Resources/Robot.qrc)
-else()
-    qt4_add_resources(RobotResource_SRCS Resources/Robot.qrc)
-endif()
-
+qt_add_resources(RobotResource_SRCS Resources/Robot.qrc)
 SOURCE_GROUP("Resources" FILES ${RobotResource_SRCS})

 set(RobotGui_UIC_SRCS
@@ -43,12 +38,6 @@ set(RobotGui_UIC_SRCS
    TaskTrajectoryDressUpParameter.ui
 )

-if(BUILD_QT5)
-    qt5_wrap_ui(RobotGui_UIC_HDRS ${RobotGui_UIC_SRCS})
-else()
-    qt4_wrap_ui(RobotGui_UIC_HDRS ${RobotGui_UIC_SRCS})
-endif()
-
 SET(RobotGui_SRCS_Module
    AppRobotGui.cpp
    Resources/Robot.qrc
--- a/src/Mod/Sketcher/Gui/CMakeLists.txt
+++ b/src/Mod/Sketcher/Gui/CMakeLists.txt
@@ -25,11 +25,7 @@ set(SketcherGui_LIBS
    FreeCADGui
 )

-if(BUILD_QT5)
-    qt5_add_resources(SketcherGui_SRCS Resources/Sketcher.qrc)
-else()
-    qt4_add_resources(SketcherGui_SRCS Resources/Sketcher.qrc)
-endif()
+qt_add_resources(SketcherGui_SRCS Resources/Sketcher.qrc)

 set(SketcherGui_UIC_SRCS
    TaskSketcherConstraints.ui
@@ -50,12 +46,6 @@ set(SketcherGui_UIC_SRCS
    ConstraintSettingsDialog.ui
 )

-if(BUILD_QT5)
-    qt5_wrap_ui(SketcherGui_UIC_HDRS ${SketcherGui_UIC_SRCS})
-else()
-    qt4_wrap_ui(SketcherGui_UIC_HDRS ${SketcherGui_UIC_SRCS})
-endif()
-
 SET(SketcherGui_SRCS
    ${SketcherGui_SRCS}
    ${SketcherGui_UIC_HDRS}
--- a/src/Mod/Spreadsheet/Gui/CMakeLists.txt
+++ b/src/Mod/Spreadsheet/Gui/CMakeLists.txt
@@ -20,20 +20,15 @@ set(SpreadsheetGui_LIBS
    FreeCADGui
 )

-if(BUILD_QT5)
-    set_property(SOURCE qtcolorpicker.h qtcolorpicker.cpp PROPERTY SKIP_AUTOMOC ON)
-    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/moc_qtcolorpicker-internal.cpp
-        COMMAND ${Qt5Core_MOC_EXECUTABLE} -o ${CMAKE_CURRENT_BINARY_DIR}/moc_qtcolorpicker-internal.cpp ${CMAKE_CURRENT_SOURCE_DIR}/qtcolorpicker.cpp
-        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/qtcolorpicker.cpp)
+set_property(SOURCE qtcolorpicker.h qtcolorpicker.cpp PROPERTY SKIP_AUTOMOC ON)
+add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/moc_qtcolorpicker-internal.cpp
+    COMMAND ${QtCore_MOC_EXECUTABLE} -o ${CMAKE_CURRENT_BINARY_DIR}/moc_qtcolorpicker-internal.cpp ${CMAKE_CURRENT_SOURCE_DIR}/qtcolorpicker.cpp
+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/qtcolorpicker.cpp)
+
+add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/moc_qtcolorpicker.cpp
+    COMMAND ${QtCore_MOC_EXECUTABLE} -o ${CMAKE_CURRENT_BINARY_DIR}/moc_qtcolorpicker.cpp ${CMAKE_CURRENT_SOURCE_DIR}/qtcolorpicker.h
+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/qtcolorpicker.h)

-    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/moc_qtcolorpicker.cpp
-        COMMAND ${Qt5Core_MOC_EXECUTABLE} -o ${CMAKE_CURRENT_BINARY_DIR}/moc_qtcolorpicker.cpp ${CMAKE_CURRENT_SOURCE_DIR}/qtcolorpicker.h
-        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/qtcolorpicker.h)
-else()
-    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/moc_qtcolorpicker-internal.cpp
-        COMMAND ${QT_MOC_EXECUTABLE} -o ${CMAKE_CURRENT_BINARY_DIR}/moc_qtcolorpicker-internal.cpp ${CMAKE_CURRENT_SOURCE_DIR}/qtcolorpicker.cpp
-        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/qtcolorpicker.cpp)
-endif()

 set_property(SOURCE qtcolorpicker.cpp APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/moc_qtcolorpicker-internal.cpp)
 set_property(SOURCE qtcolorpicker.h APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/moc_qtcolorpicker.cpp)
@@ -42,11 +37,7 @@ SET(SpreadsheetGui_RES_SRCS
    Resources/Spreadsheet.qrc
 )

-if(BUILD_QT5)
-    qt5_add_resources(SpreadsheetGui_QRC_SRCS ${SpreadsheetGui_RES_SRCS})
-else()
-    qt4_add_resources(SpreadsheetGui_QRC_SRCS ${SpreadsheetGui_RES_SRCS})
-endif()
+qt_add_resources(SpreadsheetGui_QRC_SRCS ${SpreadsheetGui_RES_SRCS})

 set(SpreadsheetGui_UIC_SRCS
   Sheet.ui
@@ -55,12 +46,6 @@ set(SpreadsheetGui_UIC_SRCS
   DlgSheetConf.ui
 )

-if(BUILD_QT5)
-    qt5_wrap_ui(SpreadsheetGui_UIC_HDRS ${SpreadsheetGui_UIC_SRCS})
-else()
-    qt4_wrap_ui(SpreadsheetGui_UIC_HDRS ${SpreadsheetGui_UIC_SRCS})
-endif()
-
 SET(SpreadsheetGui_SRCS
    ${SpreadsheetGui_QRC_SRCS}
    ${SpreadsheetGui_XML_SRCS}
@@ -117,11 +102,6 @@ set(SpreadsheetGui_UIC_SRCS
    DlgSettings.ui
 )

-
-if (BUILD_QT5)
-    qt5_wrap_ui(SpreadsheetGui_UIC_HDRS ${SpreadsheetGui_UIC_SRCS})
-endif()
-
 add_library(SpreadsheetGui SHARED ${SpreadsheetGui_SRCS} ${SpreadsheetGuiIcon_SVG})
 target_link_libraries(SpreadsheetGui ${SpreadsheetGui_LIBS})

--- a/src/Mod/Start/Gui/CMakeLists.txt
+++ b/src/Mod/Start/Gui/CMakeLists.txt
@@ -16,13 +16,7 @@ set(StartGui_UIC_SRCS
    DlgStartPreferences.ui
 )

-if(BUILD_QT5)
-    qt5_add_resources(Start_QRC_SRCS Resources/Start.qrc)
-    qt5_wrap_ui(StartGui_UIC_HDRS ${StartGui_UIC_SRCS})
-else()
-    qt4_add_resources(Start_QRC_SRCS Resources/Start.qrc)
-    qt4_wrap_ui(StartGui_UIC_HDRS ${StartGui_UIC_SRCS})
-endif()
+qt_add_resources(Start_QRC_SRCS Resources/Start.qrc)

 SET(StartGui_SRCS
    ${Start_QRC_SRCS}
--- a/src/Mod/Surface/Gui/CMakeLists.txt
+++ b/src/Mod/Surface/Gui/CMakeLists.txt
@@ -24,11 +24,7 @@ set(SurfaceGui_LIBS
    FreeCADGui
 )

-if (BUILD_QT5)
-    qt5_add_resources(SurfaceGui_QRC_SRCS Resources/Surface.qrc)
-else()
-    qt4_add_resources(SurfaceGui_QRC_SRCS Resources/Surface.qrc)
-endif()
+qt_add_resources(SurfaceGui_QRC_SRCS Resources/Surface.qrc)

 SET(SurfaceGui_UIC_SRCS
    TaskFilling.ui
@@ -43,12 +39,6 @@ SET(BlendingGui_SRCS
    Blending/ViewProviderBlendCurve.h
 )

-if (BUILD_QT5)
-    qt5_wrap_ui(SurfaceGui_UIC_HDRS ${SurfaceGui_UIC_SRCS})
-else()
-    qt4_wrap_ui(SurfaceGui_UIC_HDRS ${SurfaceGui_UIC_SRCS})
-endif()
-
 SET(SurfaceGui_SRCS
    ${SurfaceGui_QRC_SRCS}
    ${SurfaceGui_UIC_HDRS}
--- a/src/Mod/TechDraw/App/CMakeLists.txt
+++ b/src/Mod/TechDraw/App/CMakeLists.txt
@@ -26,21 +26,22 @@ set(TechDrawLIBS
    Import
 )

-if(BUILD_QT5)
+if(FREECAD_QT_MAJOR_VERSION EQUAL 5)
    include_directories(
-        ${Qt5XmlPatterns_INCLUDE_DIRS}
-        ${Qt5Concurrent_INCLUDE_DIRS}
+        ${QtXmlPatterns_INCLUDE_DIRS}
    )
-    set(QtXmlPatternsLib ${Qt5XmlPatterns_LIBRARIES})
-    list(APPEND TechDrawLIBS
-        ${Qt5Concurrent_LIBRARIES}
-    )
-else(BUILD_QT5)
-    include_directories(
-        ${QT_QTXMLPATTERNS_INCLUDE_DIR}
-    )
-    set(QtXmlPatternsLib ${QT_QTXMLPATTERNS_LIBRARY})
-endif(BUILD_QT5)
+else()
+    # This is deprecated as of Qt 5.13, and removed in Qt 6
+    message(WARNING "TechDraw relies on the now-removed Qt XMLPatterns package, and must be refactored to compile against Qt6.")
+endif()
+
+include_directories(
+    ${QtConcurrent_INCLUDE_DIRS}
+)
+set(QtXmlPatternsLib ${QtXmlPatterns_LIBRARIES})
+list(APPEND TechDrawLIBS
+    ${QtConcurrent_LIBRARIES}
+)

 link_directories(${OCC_LIBRARY_DIR})

--- a/src/Mod/TechDraw/Gui/CMakeLists.txt
+++ b/src/Mod/TechDraw/Gui/CMakeLists.txt
@@ -26,15 +26,14 @@ include_directories(
    ${XercesC_INCLUDE_DIRS}
 )

-if(BUILD_QT5)
+if(FREECAD_QT_MAJOR_VERSION EQUAL 5)
    include_directories(
-        ${Qt5XmlPatterns_INCLUDE_DIRS}
+        ${QtXmlPatterns_INCLUDE_DIRS}
    )
-else(BUILD_QT5)
-    include_directories(
-        ${QT_QTXMLPATTERNS_INCLUDE_DIR}
-    )
-endif(BUILD_QT5)
+else()
+    # This is deprecated as of Qt 5.13, and removed in Qt 6
+    message(WARNING "TechDraw relies on the now-removed Qt XMLPatterns package, and must be refactored to compile against Qt6.")
+endif()

 # The XML files
 set(TechDrawGui_XML_SRCS
@@ -47,11 +46,7 @@ set(TechDrawGui_LIBS
    FreeCADGui
 )

-if(BUILD_QT5)
-    qt5_add_resources(TechDrawGui_SRCS Resources/TechDraw.qrc)
-else()
-    qt4_add_resources(TechDrawGui_SRCS Resources/TechDraw.qrc)
-endif()
+qt_add_resources(TechDrawGui_SRCS Resources/TechDraw.qrc)

 set(TechDrawGui_UIC_SRCS
    DlgPageChooser.ui
@@ -90,12 +85,6 @@ set(TechDrawGui_UIC_SRCS
    TaskComplexSection.ui
 )

-if(BUILD_QT5)
-    qt5_wrap_ui(TechDrawGui_UIC_HDRS ${TechDrawGui_UIC_SRCS})
-else()
-    qt4_wrap_ui(TechDrawGui_UIC_HDRS ${TechDrawGui_UIC_SRCS})
-endif()
-
 SET(MRTE_SRCS
    mrichtextedit.ui
    mrichtextedit.cpp
--- a/src/Mod/Test/Gui/CMakeLists.txt
+++ b/src/Mod/Test/Gui/CMakeLists.txt
@@ -14,12 +14,6 @@ set(Dialogs_UIC_SRCS
    UnitTest.ui
 )

-if(BUILD_QT5)
-    qt5_wrap_ui(Dialogs_UIC_HDRS ${Dialogs_UIC_SRCS})
-else()
-    qt4_wrap_ui(Dialogs_UIC_HDRS ${Dialogs_UIC_SRCS})
-endif()
-
 SET(Dialogs_SRCS
    ${Dialogs_UIC_HDRS}
    UnitTest.ui
@@ -30,11 +24,7 @@ SET(Dialogs_SRCS
 )
 SOURCE_GROUP("Dialogs" FILES ${Dialogs_SRCS})

-if(BUILD_QT5)
-    qt5_add_resources(Resource_SRCS Resources/Test.qrc)
-else()
-    qt4_add_resources(Resource_SRCS Resources/Test.qrc)
-endif()
+qt_add_resources(Resource_SRCS Resources/Test.qrc)

 SET(Resource_SRCS
    ${Resource_SRCS}
--- a/src/Mod/Web/App/CMakeLists.txt
+++ b/src/Mod/Web/App/CMakeLists.txt
@@ -7,20 +7,13 @@ include_directories(
    ${ZLIB_INCLUDE_DIR}
 )

-if(BUILD_QT5)
-    include_directories(
-        ${Qt5Network_INCLUDE_DIRS}
-    )
-    set(Web_LIBS
-         FreeCADApp
-         ${Qt5Network_LIBRARIES}
-    )
-else()
-    set(Web_LIBS
-         FreeCADApp
-         ${QT_LIBRARIES}
-    )
-endif()
+include_directories(
+    ${QtNetwork_INCLUDE_DIRS}
+)
+set(Web_LIBS
+    FreeCADApp
+    ${QtNetwork_LIBRARIES}
+)

 SET(Web_SRCS
    AppWeb.cpp
--- a/src/Mod/Web/CMakeLists.txt
+++ b/src/Mod/Web/CMakeLists.txt
@@ -7,7 +7,7 @@ set(Web_Scripts
 )

 if(BUILD_GUI)
-    if(Qt5WebEngineWidgets_FOUND OR Qt5WebKitWidgets_FOUND OR QT_QTWEBKIT_FOUND)
+    if(QtWebEngineWidgets_FOUND)
        add_subdirectory(Gui)
        list (APPEND Web_Scripts InitGui.py)
    endif()
--- a/src/Mod/Web/Gui/CMakeLists.txt
+++ b/src/Mod/Web/Gui/CMakeLists.txt
@@ -7,28 +7,17 @@ include_directories(
    ${XercesC_INCLUDE_DIRS}
 )

-if (Qt5WebEngineWidgets_FOUND)
+if (QtWebEngineWidgets_FOUND)
    add_definitions(-DQTWEBENGINE)
-elseif(Qt5WebKitWidgets_FOUND OR QT_QTWEBKIT_FOUND) # Qt5 and Qt4
-    add_definitions(-DQTWEBKIT)
 endif()

 set(WebGui_LIBS
    FreeCADGui
 )

-if(BUILD_QT5)
-    if(Qt5WebEngineWidgets_FOUND)
-        include_directories(${Qt5WebEngineWidgets_INCLUDE_DIRS})
-        list(APPEND WebGui_LIBS ${Qt5WebEngineWidgets_LIBRARIES})
-    else()
-        include_directories(${Qt5WebKitWidgets_INCLUDE_DIRS})
-        list(APPEND WebGui_LIBS ${Qt5WebKitWidgets_LIBRARIES})
-    endif()
-    qt5_add_resources(Web_QRC_SRCS Resources/Web.qrc)
-else()
-    qt4_add_resources(Web_QRC_SRCS Resources/Web.qrc)
-endif()
+include_directories(${QtWebEngineWidgets_INCLUDE_DIRS})
+list(APPEND WebGui_LIBS ${QtWebEngineWidgets_LIBRARIES})
+qt_add_resources(Web_QRC_SRCS Resources/Web.qrc)

 SET(WebGui_SRCS
    ${Web_QRC_SRCS}
@@ -40,8 +29,8 @@ SET(WebGui_SRCS
    Workbench.h
    BrowserView.h
    BrowserView.cpp
-    CookieJar.cpp   # QWebkit only
-    CookieJar.h     # QWebkit only
+    CookieJar.cpp
+    CookieJar.h
 )

 SET(WebGuiIcon_SVG