1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
Author: Patrick Franz <deltaone@debian.org>
Description: Disable the check for a 32bit architecture
See https://code.qt.io/cgit/qt/qtwebengine.git/commit/?id=2c80ff478bcc3290cafd970c5fd3412f2887fc91
Forwarded: not-needed
diff --git a/cmake/FindNodejs.cmake b/cmake/FindNodejs.cmake
index 00ce5696c..0aeef5ab3 100644
--- a/cmake/FindNodejs.cmake
+++ b/cmake/FindNodejs.cmake
@@ -9,11 +9,6 @@ if(Nodejs_EXECUTABLE)
OUTPUT_VARIABLE Nodejs_VERSION
ERROR_QUIET
OUTPUT_STRIP_TRAILING_WHITESPACE)
-
- execute_process(
- COMMAND ${Nodejs_EXECUTABLE} -p "process.arch"
- OUTPUT_VARIABLE Nodejs_ARCH
- OUTPUT_STRIP_TRAILING_WHITESPACE)
endif()
string (REGEX MATCHALL "([1-9][0-9])\..*" Nodejs_VERSION "${Nodejs_VERSION}")
diff --git a/configure.cmake b/configure.cmake
index 86c120248..f3e99be1c 100644
--- a/configure.cmake
+++ b/configure.cmake
@@ -321,15 +321,6 @@ qt_webengine_configure_check("static-build"
MESSAGE "Static build is not supported."
)
-qt_webengine_configure_check("nodejs"
- MODULES QtWebEngine
- CONDITION TARGET Nodejs::Nodejs AND
- NOT (Nodejs_ARCH STREQUAL "ia32") AND
- NOT (Nodejs_ARCH STREQUAL "x86") AND
- NOT (Nodejs_ARCH STREQUAL "arm")
- MESSAGE "64-bit Node.js ${QT_CONFIGURE_CHECK_nodejs_version} version or later is required."
- DOCUMENTATION "64-bit Nodejs ${QT_CONFIGURE_CHECK_nodejs_version} version or later."
-)
qt_webengine_configure_check("python3"
MODULES QtWebEngine QtPdf
CONDITION Python3_FOUND
|
