From 01396539399ba04dc61a3438b729c6d1e0e63904 Mon Sep 17 00:00:00 2001 From: looooo Date: Tue, 12 Sep 2017 21:24:54 +0200 Subject: [PATCH] qt5: win: use qtwebkit by default use -DBUILD_QT5_WEBKIT=OFF to disable qtwebkit for qt5 --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e71caca77d..a2483ec369 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -162,6 +162,7 @@ endif(MSVC) # Switch to build FreeCAD with Qt5 OPTION(BUILD_QT5 "Build with Qt5." OFF) +OPTION(BUILD_QT5_WEBKIT "Build with Qt5." ON) OPTION(BUILD_GUI "Build FreeCAD Gui. Otherwise you have only the command line and the Python import module." ON) OPTION(FREECAD_MAINTAINERS_BUILD "Build FreeCAD for Maintainers, with Docu and 3rd party libs. On Windows the Installer is build." OFF) OPTION(FREECAD_USE_EXTERNAL_ZIPIOS "Use system installed zipios++ instead of the bundled." OFF) @@ -802,9 +803,8 @@ endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") find_package(Qt5UiTools) find_package(Qt5Network) find_package(Qt5Concurrent) - if (NOT WIN32) - # Disable for Windows for now since building the Qt sources always fails - find_package(Qt5WebKitWidgets) + if (BUILD_QT5_WEBKIT) + find_package(Qt5WebKitWidgets) endif() endif(BUILD_GUI)