diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-10-06 17:06:14 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-12-02 09:18:45 +0100 |
| commit | 61de0e721f672e854551a8938d2d42ba946398cf (patch) | |
| tree | 2a36dfb72417701b093cde8b333a434f8fcacd27 /configure.cmake | |
| parent | 5dc3a3fb5e3286a9643fece7c7f94cec7fc29f3e (diff) | |
Adaptations for Chromium 94
Change-Id: I9fb8998a3a7762b0aea70993ca231f0bbf4f7761
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'configure.cmake')
| -rw-r--r-- | configure.cmake | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/configure.cmake b/configure.cmake index 0129b8a28..291ed57df 100644 --- a/configure.cmake +++ b/configure.cmake @@ -7,13 +7,13 @@ if(QT_CONFIGURE_RUNNING) else() find_package(Ninja 1.7.2) find_package(Gn ${QT_REPO_MODULE_VERSION} EXACT) - find_package(Python2 2.7.5) + find_package(Python3 3.7) find_package(GPerf) find_package(BISON) find_package(FLEX) find_package(PkgConfig) find_package(Snappy) - find_package(Nodejs 10.19) + find_package(Nodejs 12.0) endif() if(PkgConfig_FOUND) @@ -48,6 +48,14 @@ if(PkgConfig_FOUND) pkg_check_modules(LIBPCI libpci) endif() +if(Python3_FOUND) + execute_process( + COMMAND ${Python3_EXECUTABLE} -c "import html5lib" + RESULT_VARIABLE html5lib_NOT_FOUND + OUTPUT_QUIET + ) +endif() + #### Tests if(LINUX) check_for_ulimit() @@ -380,12 +388,17 @@ add_check_for_support( add_check_for_support( MODULES QtWebEngine QtPdf CONDITION TARGET Nodejs::Nodejs - MESSAGE "node.js version 10.19 or later is required." + MESSAGE "node.js version 12 or later is required." +) +add_check_for_support( + MODULES QtWebEngine QtPdf + CONDITION Python3_FOUND + MESSAGE "Python version 3.7 or later is required." ) add_check_for_support( MODULES QtWebEngine QtPdf - CONDITION Python2_FOUND - MESSAGE "Python2 version 2.7.5 or later is required." + CONDITION Python3_FOUND AND NOT html5lib_NOT_FOUND + MESSAGE "Python3 html5lib is missing." ) add_check_for_support( MODULES QtWebEngine QtPdf |