Merge pull request #378 from wwmayer/qt5_port

Qt5 port

src/Mod/Complete/Gui/CMakeLists.txt

@@ -12,7 +12,11 @@ set(CompleteGui_LIBS
     FreeCADGui
 )
 
-qt4_add_resources(Complete_QRC_SRCS Resources/Complete.qrc)
+if (BUILD_QT5)
+    qt5_add_resources(Complete_QRC_SRCS Resources/Complete.qrc)
+else()
+    qt4_add_resources(Complete_QRC_SRCS Resources/Complete.qrc)
+endif()
 
 SET(CompleteGui_SRCS
     ${Complete_QRC_SRCS}

src/Mod/Drawing/Gui/CMakeLists.txt

@@ -35,13 +35,17 @@ set(DrawingGui_MOC_HDRS
 fc_wrap_cpp(DrawingGui_MOC_SRCS ${DrawingGui_MOC_HDRS})
 SOURCE_GROUP("Moc" FILES ${DrawingGui_MOC_SRCS})
 
-qt4_add_resources(DrawingGui_SRCS Resources/Drawing.qrc)
-
 set(DrawingGui_UIC_SRCS
     TaskOrthoViews.ui
 )
 
-qt4_wrap_ui(DrawingGui_UIC_HDRS ${DrawingGui_UIC_SRCS})
+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()
 
 SET(DrawingGui_SRCS
     ${DrawingGui_SRCS}

src/Mod/Fem/Gui/CMakeLists.txt

@@ -116,7 +116,12 @@ if(BUILD_FEM_VTK)
         SphereWidget.ui
     )
 endif(BUILD_FEM_VTK)
-qt4_wrap_ui(FemGui_UIC_HDRS ${FemGui_UIC_SRCS})
+
+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}
@@ -178,7 +183,11 @@ SET(FemGui_DLG_SRCS
 )
 SOURCE_GROUP("Constraint-Dialogs" FILES ${FemGui_DLG_SRCS})
 
-qt4_add_resources(FemResource_SRCS Resources/Fem.qrc)
+if(BUILD_QT5)
+    qt5_add_resources(FemResource_SRCS Resources/Fem.qrc)
+else()
+    qt4_add_resources(FemResource_SRCS Resources/Fem.qrc)
+endif()
 
 SOURCE_GROUP("Resources" FILES ${FemResource_SRCS})
 

src/Mod/Image/Gui/CMakeLists.txt

@@ -34,12 +34,17 @@ SET(ImageGui_RES_SRCS
     Resources/Image.qrc
 )
 
-qt4_add_resources(ImageGui_QRC_SRCS ${ImageGui_RES_SRCS})
-
 set(ImageGui_UIC_SRCS
     ImageOrientationDialog.ui
 )
-qt4_wrap_ui(ImageGui_UIC_HDRS ${ImageGui_UIC_SRCS})
+
+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()
 
 SET(ImageGui_SRCS
 #   ${ImageGui_MOC_SRCS}

src/Mod/Inspection/Gui/CMakeLists.txt

@@ -15,8 +15,6 @@ set(InspectionGui_LIBS
     FreeCADGui
 )
 
-qt4_add_resources(Inspection_QRC_SRCS Resources/Inspection.qrc)
-
 set(InspectionGui_MOC_HDRS
     VisualInspection.h
 )
@@ -26,7 +24,15 @@ SOURCE_GROUP("Moc" FILES ${InspectionGui_MOC_SRCS})
 set(Dialogs_UIC_SRCS
     VisualInspection.ui
 )
-qt4_wrap_ui(Dialogs_UIC_HDRS ${Dialogs_UIC_SRCS})
+
+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()
+
 SET(Dialogs_SRCS
     ${Dialogs_UIC_HDRS}
     VisualInspection.cpp

src/Mod/Mesh/App/CMakeLists.txt

@@ -13,13 +13,21 @@ include_directories(
     ${EIGEN3_INCLUDE_DIR}
 )
 
-
 set(Mesh_LIBS
     ${Boost_LIBRARIES}
     FreeCADBase
     FreeCADApp
 )
 
+if (BUILD_QT5)
+    include_directories(
+        ${Qt5Concurrent_INCLUDE_DIRS}
+    )
+    list(APPEND Mesh_LIBS
+        ${Qt5Concurrent_LIBRARIES}
+    )
+endif()
+
 generate_from_xml(FacetPy)
 generate_from_xml(MeshFeaturePy)
 generate_from_xml(MeshPointPy)

src/Mod/Mesh/Gui/CMakeLists.txt

@@ -41,7 +41,7 @@ set(Dialogs_UIC_SRCS
     Segmentation.ui
     Selection.ui
 )
-qt4_wrap_ui(Dialogs_UIC_HDRS ${Dialogs_UIC_SRCS})
+
 SET(Dialogs_SRCS
     ${Dialogs_UIC_HDRS}
     DlgEvaluateMesh.ui
@@ -56,6 +56,7 @@ SET(Dialogs_SRCS
     DlgSettingsMeshView.ui
     DlgSettingsMeshView.cpp
     DlgSettingsMeshView.h
+    DlgSettingsImportExport.ui
     DlgSettingsImportExportImp.cpp
     DlgSettingsImportExportImp.h
     DlgSmoothing.ui
@@ -83,7 +84,14 @@ SET(Inventor_SRCS
 )
 SOURCE_GROUP("Inventor" FILES ${Inventor_SRCS})
 
-qt4_add_resources(resource_SRCS Resources/Mesh.qrc)
+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()
+
 SET(resource_SRCS
     ${resource_SRCS}
     Resources/Mesh.qrc

src/Mod/MeshPart/Gui/CMakeLists.txt

@@ -38,12 +38,17 @@ set(MeshPartGui_MOC_HDRS
 fc_wrap_cpp(MeshPartGui_MOC_SRCS ${MeshPartGui_MOC_HDRS})
 SOURCE_GROUP("Moc" FILES ${MeshPartGui_MOC_SRCS})
 
-qt4_add_resources(MeshPartGui_QRC_SRCS Resources/MeshPart.qrc)
-
 set(MeshPartGui_UIC_SRCS
     Tessellation.ui
 )
-qt4_wrap_ui(MeshPartGui_UIC_HDRS ${MeshPartGui_UIC_SRCS})
+
+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()
 
 SET(MeshPartGui_SRCS
     ${MeshPartGui_QRC_SRCS}

src/Mod/Part/Gui/CMakeLists.txt

@@ -23,6 +23,15 @@ set(PartGui_LIBS
     FreeCADGui
 )
 
+if (BUILD_QT5)
+    include_directories(
+        ${Qt5Concurrent_INCLUDE_DIRS}
+    )
+    list(APPEND PartGui_LIBS
+        ${Qt5Concurrent_LIBRARIES}
+    )
+endif()
+
 set(PartGui_MOC_HDRS
     CrossSections.h
     Mirroring.h
@@ -51,7 +60,11 @@ set(PartGui_MOC_HDRS
 fc_wrap_cpp(PartGui_MOC_SRCS ${PartGui_MOC_HDRS})
 SOURCE_GROUP("Moc" FILES ${PartGui_MOC_SRCS})
 
-qt4_add_resources(PartGui_QRC_SRCS Resources/Part.qrc)
+if (BUILD_QT5)
+    qt5_add_resources(PartGui_QRC_SRCS Resources/Part.qrc)
+else()
+    qt4_add_resources(PartGui_QRC_SRCS Resources/Part.qrc)
+endif()
 
 set(PartGui_UIC_SRCS
     CrossSections.ui
@@ -78,7 +91,12 @@ set(PartGui_UIC_SRCS
     TaskSweep.ui
     TaskAttacher.ui
 )
-qt4_wrap_ui(PartGui_UIC_HDRS ${PartGui_UIC_SRCS})
+
+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}

src/Mod/PartDesign/Gui/CMakeLists.txt

@@ -56,7 +56,11 @@ set(PartDesignGui_MOC_HDRS
 fc_wrap_cpp(PartDesignGui_MOC_SRCS ${PartDesignGui_MOC_HDRS})
 SOURCE_GROUP("Moc" FILES ${PartDesignGui_MOC_SRCS})
 
-qt4_add_resources(PartDesignGui_SRCS Resources/PartDesign.qrc)
+if(BUILD_QT5)
+    qt5_add_resources(PartDesignGui_SRCS Resources/PartDesign.qrc)
+else()
+    qt4_add_resources(PartDesignGui_SRCS Resources/PartDesign.qrc)
+endif()
 
 set(PartDesignGui_UIC_SRCS
     TaskFeaturePick.ui
@@ -83,7 +87,12 @@ set(PartDesignGui_UIC_SRCS
     TaskLoftParameters.ui
     DlgReference.ui
 )
-qt4_wrap_ui(PartDesignGui_UIC_HDRS ${PartDesignGui_UIC_SRCS})
+
+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

src/Mod/Path/Gui/CMakeLists.txt

@@ -25,7 +25,11 @@ set(PathGui_LIBS
     FreeCADGui
 )
 
-qt4_add_resources(PathResource_SRCS Resources/Path.qrc)
+if(BUILD_QT5)
+    qt5_add_resources(PathResource_SRCS Resources/Path.qrc)
+else()
+    qt4_add_resources(PathResource_SRCS Resources/Path.qrc)
+endif()
 
 SOURCE_GROUP("Resources" FILES ${PathResource_SRCS})
 
@@ -43,7 +47,12 @@ set(PathGui_UIC_SRCS
     TaskDlgPathCompound.ui
     DlgProcessorChooser.ui
 )
-qt4_wrap_ui(PathGui_UIC_HDRS ${PathGui_UIC_SRCS})
+
+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

src/Mod/Points/Gui/CMakeLists.txt

@@ -26,7 +26,13 @@ SOURCE_GROUP("Moc" FILES ${PointsGui_MOC_SRCS})
 set(Dialog_UIC_SRCS
     DlgPointsRead.ui
 )
-qt4_wrap_ui(Dialogs_UIC_HDRS ${Dialog_UIC_SRCS})
+
+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
@@ -35,7 +41,12 @@ SET(Dialogs_SRCS
 )
 SOURCE_GROUP("Dialogs" FILES ${Dialogs_SRCS})
 
-qt4_add_resources(Resource_SRCS Resources/Points.qrc)
+if (BUILD_QT5)
+    qt5_add_resources(Resource_SRCS Resources/Points.qrc)
+else()
+    qt4_add_resources(Resource_SRCS Resources/Points.qrc)
+endif()
+
 SET(Resource_SRCS
     ${Resource_SRCS}
     Resources/Points.qrc

src/Mod/Raytracing/Gui/CMakeLists.txt

@@ -42,7 +42,6 @@ set(RaytracingGui_MOC_HDRS
 fc_wrap_cpp(RaytracingGui_MOC_SRCS ${RaytracingGui_MOC_HDRS})
 SOURCE_GROUP("Moc" FILES ${RaytracingGui_MOC_SRCS})
 
-qt4_add_resources(Resource_SRCS Resources/Raytracing.qrc)
 SET(Resource_SRCS
     ${Resource_SRCS}
     Resources/Raytracing.qrc
@@ -52,7 +51,14 @@ SOURCE_GROUP("Resource" FILES ${Resource_SRCS})
 set(RaytracingGui_UIC_SRCS
     DlgSettingsRay.ui
 )
-qt4_wrap_ui(RaytracingGui_UIC_HDRS ${RaytracingGui_UIC_SRCS})
+
+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()
 
 SET(RaytracingGui_SRCS
     ${Resource_SRCS}

src/Mod/ReverseEngineering/Gui/CMakeLists.txt

@@ -22,7 +22,11 @@ set(ReenGui_LIBS
     FreeCADGui
 )
 
-qt4_add_resources(ReenGui_QRC_SRCS Resources/ReverseEngineering.qrc)
+if(BUILD_QT5)
+    qt5_add_resources(ReenGui_QRC_SRCS Resources/ReverseEngineering.qrc)
+else()
+    qt4_add_resources(ReenGui_QRC_SRCS Resources/ReverseEngineering.qrc)
+endif()
 
 set(ReenGui_MOC_HDRS
     FitBSplineSurface.h
@@ -35,7 +39,13 @@ set(Dialogs_UIC_SRCS
     FitBSplineSurface.ui
     Poisson.ui
 )
-qt4_wrap_ui(Dialogs_UIC_HDRS ${Dialogs_UIC_SRCS})
+
+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}

src/Mod/Robot/Gui/CMakeLists.txt

@@ -25,7 +25,11 @@ set(RobotGui_LIBS
     FreeCADGui
 )
 
-qt4_add_resources(RobotResource_SRCS Resources/Robot.qrc)
+if(BUILD_QT5)
+    qt5_add_resources(RobotResource_SRCS Resources/Robot.qrc)
+else()
+    qt4_add_resources(RobotResource_SRCS Resources/Robot.qrc)
+endif()
 
 SOURCE_GROUP("Resources" FILES ${RobotResource_SRCS})
 
@@ -39,7 +43,11 @@ set(RobotGui_UIC_SRCS
     TaskTrajectoryDressUpParameter.ui
 )
 
-qt4_wrap_ui(RobotGui_UIC_HDRS ${RobotGui_UIC_SRCS})
+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_MOC_HDRS
     TaskTrajectory.h

src/Mod/Sketcher/Gui/CMakeLists.txt

@@ -43,7 +43,11 @@ set(SketcherGui_MOC_HDRS
 fc_wrap_cpp(SketcherGui_MOC_SRCS ${SketcherGui_MOC_HDRS})
 SOURCE_GROUP("Moc" FILES ${SketcherGui_MOC_SRCS})
 
-qt4_add_resources(SketcherGui_SRCS Resources/Sketcher.qrc)
+if(BUILD_QT5)
+    qt5_add_resources(SketcherGui_SRCS Resources/Sketcher.qrc)
+else()
+    qt4_add_resources(SketcherGui_SRCS Resources/Sketcher.qrc)
+endif()
 
 set(SketcherGui_UIC_SRCS
     TaskSketcherConstrains.ui
@@ -58,7 +62,12 @@ set(SketcherGui_UIC_SRCS
     SketcherSettings.ui
     SketchRectangularArrayDialog.ui
 )
-qt4_wrap_ui(SketcherGui_UIC_HDRS ${SketcherGui_UIC_SRCS})
+
+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}

src/Mod/Spreadsheet/Gui/CMakeLists.txt

@@ -24,9 +24,15 @@ set(SpreadsheetGui_MOC_HDRS
     qtcolorpicker.h
 )
 
-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)
+if(BUILD_QT5)
+    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)
+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)
 
@@ -38,14 +44,22 @@ SET(SpreadsheetGui_RES_SRCS
     Resources/Spreadsheet.qrc
 )
 
-qt4_add_resources(SpreadsheetGui_QRC_SRCS ${SpreadsheetGui_RES_SRCS})
+if(BUILD_QT5)
+    qt5_add_resources(SpreadsheetGui_QRC_SRCS ${SpreadsheetGui_RES_SRCS})
+else()
+    qt4_add_resources(SpreadsheetGui_QRC_SRCS ${SpreadsheetGui_RES_SRCS})
+endif()
 
 set(SpreadsheetGui_UIC_SRCS
    Sheet.ui
    PropertiesDialog.ui
 )
 
-qt4_wrap_ui(SpreadsheetGui_UIC_HDRS ${SpreadsheetGui_UIC_SRCS})
+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_MOC_SRCS}

src/Mod/Start/Gui/CMakeLists.txt

@@ -12,7 +12,11 @@ set(StartGui_LIBS
     FreeCADGui
 )
 
-qt4_add_resources(Start_QRC_SRCS Resources/Start.qrc)
+if(BUILD_QT5)
+    qt5_add_resources(Start_QRC_SRCS Resources/Start.qrc)
+else()
+    qt4_add_resources(Start_QRC_SRCS Resources/Start.qrc)
+endif()
 
 SET(StartGui_SRCS
     ${Start_QRC_SRCS}

src/Mod/TechDraw/Gui/CMakeLists.txt

@@ -41,7 +41,11 @@ set(TechDrawGui_MOC_HDRS
 fc_wrap_cpp(TechDrawGui_MOC_SRCS ${TechDrawGui_MOC_HDRS})
 SOURCE_GROUP("Moc" FILES ${TechDrawGui_MOC_SRCS})
 
-qt4_add_resources(TechDrawGui_SRCS Resources/TechDraw.qrc)
+if(BUILD_QT5)
+    qt5_add_resources(TechDrawGui_SRCS Resources/TechDraw.qrc)
+else()
+    qt4_add_resources(TechDrawGui_SRCS Resources/TechDraw.qrc)
+endif()
 
 set(TechDrawGui_UIC_SRCS
     DlgPrefsTechDraw.ui
@@ -52,7 +56,11 @@ set(TechDrawGui_UIC_SRCS
     TaskSectionView.ui
 )
 
-qt4_wrap_ui(TechDrawGui_UIC_HDRS ${TechDrawGui_UIC_SRCS})
+if(BUILD_QT5)
+    qt5_wrap_ui(TechDrawGui_UIC_HDRS ${TechDrawGui_UIC_SRCS})
+else()
+    qt4_wrap_ui(TechDrawGui_UIC_HDRS ${TechDrawGui_UIC_SRCS})
+endif()
 
 SET(TechDrawGui_SRCS
     ${TechDrawGui_SRCS}

src/Mod/Test/Gui/CMakeLists.txt

@@ -18,7 +18,13 @@ SOURCE_GROUP("Moc" FILES ${Test_MOC_SRCS})
 set(Dialogs_UIC_SRCS
     UnitTest.ui
 )
-qt4_wrap_ui(Dialogs_UIC_HDRS ${Dialogs_UIC_SRCS})
+
+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
@@ -29,7 +35,11 @@ SET(Dialogs_SRCS
 )
 SOURCE_GROUP("Dialogs" FILES ${Dialogs_SRCS})
 
-qt4_add_resources(Resource_SRCS Resources/Test.qrc)
+if(BUILD_QT5)
+    qt5_add_resources(Resource_SRCS Resources/Test.qrc)
+else()
+    qt4_add_resources(Resource_SRCS Resources/Test.qrc)
+endif()
 SET(Resource_SRCS
     ${Resource_SRCS}
     Resources/Test.qrc

src/Mod/Web/App/CMakeLists.txt

@@ -8,10 +8,20 @@ include_directories(
     ${XercesC_INCLUDE_DIRS}
 )
 
-set(Web_LIBS
-     FreeCADApp
-     ${QT_LIBRARIES}
-)
+if(BUILD_QT5)
+    include_directories(
+        ${Qt5Network_INCLUDE_DIRS}
+    )
+    set(Web_LIBS
+         FreeCADApp
+         ${Qt5Network_LIBRARIES}
+    )
+else()
+    set(Web_LIBS
+         FreeCADApp
+         ${QT_LIBRARIES}
+    )
+endif()
 
 set(Web_MOC_HDRS
     Server.h

src/Mod/Web/CMakeLists.txt

@@ -1,7 +1,9 @@
 
 add_subdirectory(App)
 if(BUILD_GUI)
-    add_subdirectory(Gui)
+    if(Qt5WebKitWidgets_FOUND OR QT_QTWEBKIT_FOUND)
+        add_subdirectory(Gui)
+    endif()
 endif(BUILD_GUI)
 
 INSTALL(

src/Mod/Web/Gui/CMakeLists.txt

@@ -11,7 +11,17 @@ set(WebGui_LIBS
     FreeCADGui
 )
 
-qt4_add_resources(Web_QRC_SRCS Resources/Web.qrc)
+if(BUILD_QT5)
+    include_directories(
+        ${Qt5WebKitWidgets_INCLUDE_DIRS}
+    )
+    list(APPEND WebGui_LIBS
+        ${Qt5WebKitWidgets_LIBRARIES}
+    )
+    qt5_add_resources(Web_QRC_SRCS Resources/Web.qrc)
+else()
+    qt4_add_resources(Web_QRC_SRCS Resources/Web.qrc)
+endif()
 
 SET(WebGui_SRCS
     ${Web_QRC_SRCS}