suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use Qt WebKit module

Browse Source
This commit is contained in:
wmayer 2016-12-13 19:48:22 +01:00
parent 87f2866884
commit deddc4b3e2
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -722,7 +722,10 @@ endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
find_package(Qt5UiTools) find_package(Qt5UiTools)
find_package(Qt5Network) find_package(Qt5Network)
find_package(Qt5Concurrent) find_package(Qt5Concurrent)
#find_package(Qt5WebEngine) if (NOT WIN32)
# Disable for Windows for now since building the Qt sources always fails
find_package(Qt5WebKitWidgets)
endif()
endif(BUILD_GUI) endif(BUILD_GUI)
IF(NOT Qt5Core_FOUND) IF(NOT Qt5Core_FOUND)

2
src/Mod/Web/CMakeLists.txt
View File

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

4
src/Mod/Web/Gui/CMakeLists.txt
View File

@ -13,10 +13,10 @@ set(WebGui_LIBS
if(BUILD_QT5) if(BUILD_QT5)
include_directories( include_directories(
${Qt5WebEngine_INCLUDE_DIRS} ${Qt5WebKitWidgets_INCLUDE_DIRS}
) )
list(APPEND WebGui_LIBS list(APPEND WebGui_LIBS
${Qt5WebEngine_LIBRARIES} ${Qt5WebKitWidgets_LIBRARIES}
) )
qt5_add_resources(Web_QRC_SRCS Resources/Web.qrc) qt5_add_resources(Web_QRC_SRCS Resources/Web.qrc)
else() else()

7
src/Tools/_TEMPLATE_/Gui/CMakeLists.txt
View File

@ -4,7 +4,6 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${COIN3D_INCLUDE_DIRS} ${COIN3D_INCLUDE_DIRS}
${QT_INCLUDE_DIR}
${ZLIB_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS}
${XercesC_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS}
@ -15,7 +14,11 @@ set(_TEMPLATE_Gui_LIBS
FreeCADGui FreeCADGui
) )
qt4_add_resources(_TEMPLATE__QRC_SRCS Resources/_TEMPLATE_.qrc) if (BUILD_QT5)
qt5_add_resources(_TEMPLATE__QRC_SRCS Resources/_TEMPLATE_.qrc)
else()
qt4_add_resources(_TEMPLATE__QRC_SRCS Resources/_TEMPLATE_.qrc)
endif()
SET(_TEMPLATE_Gui_SRCS SET(_TEMPLATE_Gui_SRCS
${_TEMPLATE__QRC_SRCS} ${_TEMPLATE__QRC_SRCS}