From 484cc632143cb3367f5679d1551db030f8f32854 Mon Sep 17 00:00:00 2001 From: xarkes Date: Fri, 28 Sep 2018 09:40:55 +0200 Subject: [PATCH] Disabled QtWebEngine by default. (#728) --- radare2 | 2 +- src/CMakeLists.txt | 2 +- src/Cutter.pro | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/radare2 b/radare2 index 8786d57a..a873a4d9 160000 --- a/radare2 +++ b/radare2 @@ -1 +1 @@ -Subproject commit 8786d57aa51d696cd3ae8f11d8d14f2a01f7178f +Subproject commit a873a4d942f491d28c6a17a62ca1a434e58d3eb1 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8f53d924..79f83bb4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -5,7 +5,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") include(DisallowInSource) option(CUTTER_ENABLE_JUPYTER "Enable Jupyter integration. Requires Python >= 3.3." ON) -option(CUTTER_ENABLE_QTWEBENGINE "Use QtWebEngine for in-app Jupyter Browser. Unused if CUTTER_ENABLE_JUPYTER=OFF." ON) +option(CUTTER_ENABLE_QTWEBENGINE "Use QtWebEngine for in-app Jupyter Browser. Unused if CUTTER_ENABLE_JUPYTER=OFF." OFF) # Parse Cutter.pro to get filenames diff --git a/src/Cutter.pro b/src/Cutter.pro index d49efbd3..1387a2b6 100644 --- a/src/Cutter.pro +++ b/src/Cutter.pro @@ -24,7 +24,7 @@ CONFIG += c++11 !defined(CUTTER_ENABLE_JUPYTER, var) CUTTER_ENABLE_JUPYTER=true equals(CUTTER_ENABLE_JUPYTER, true) CONFIG += CUTTER_ENABLE_JUPYTER -!defined(CUTTER_ENABLE_QTWEBENGINE, var) CUTTER_ENABLE_QTWEBENGINE=true +!defined(CUTTER_ENABLE_QTWEBENGINE, var) CUTTER_ENABLE_QTWEBENGINE=false equals(CUTTER_ENABLE_JUPYTER, true) { equals(CUTTER_ENABLE_QTWEBENGINE, true) CONFIG += CUTTER_ENABLE_QTWEBENGINE }