diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-06-28 11:06:20 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-07-13 11:11:40 +0200 |
| commit | 734b635cf9a9316ddd05dc9d9abc0a93746fc7f3 (patch) | |
| tree | 49c6736d1c0c792326dd52b7541bea361c478609 /src/core/api | |
| parent | b848c87dbbc317ad7186418a64670b52777d1393 (diff) | |
Adaptations for 90-based
Change-Id: I8402b044d8e12d75e144a00984b856f3de10bffd
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
(cherry picked from commit 1d988d971bc4270ba3d148e8e2c143bf8f625b6e)
Diffstat (limited to 'src/core/api')
| -rw-r--r-- | src/core/api/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/core/api/core_api.pro | 3 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/core/api/CMakeLists.txt b/src/core/api/CMakeLists.txt index 2a0c1ebf7..afb00038a 100644 --- a/src/core/api/CMakeLists.txt +++ b/src/core/api/CMakeLists.txt @@ -48,6 +48,10 @@ qt_internal_add_module(WebEngineCore ../ ../../3rdparty/chromium ../../3rdparty/chromium/third_party/abseil-cpp + ../../3rdparty/chromium/third_party/perfetto/include + ${buildDir}/$<CONFIG>/gen + ${buildDir}/$<CONFIG>/gen/third_party/perfetto + ${buildDir}/$<CONFIG>/gen/third_party/perfetto/build_config LIBRARIES Qt::CorePrivate Qt::GuiPrivate @@ -66,6 +70,10 @@ qt_skip_warnings_are_errors(WebEngineCore) make_install_only(WebEngineCore) make_config_for_gn(WebEngineCore gn_config) +if(CLANG OR GCC) + target_compile_options(WebEngineCore PRIVATE "-Wno-unused-parameter") +endif() + qt_internal_extend_target(WebEngineCore CONDITION QT_FEATURE_webengine_webchannel PUBLIC_LIBRARIES Qt::WebChannel diff --git a/src/core/api/core_api.pro b/src/core/api/core_api.pro index 7b0c3eb0c..2408a5869 100644 --- a/src/core/api/core_api.pro +++ b/src/core/api/core_api.pro @@ -31,7 +31,10 @@ CHROMIUM_SRC_DIR = $$QTWEBENGINE_ROOT/$$getChromiumSrcDir() CHROMIUM_GEN_DIR = $$OUT_PWD/../$$getConfigDir()/gen INCLUDEPATH += $$QTWEBENGINE_ROOT/src/core \ $$CHROMIUM_GEN_DIR \ + $$CHROMIUM_GEN_DIR/third_party/perfetto \ + $$CHROMIUM_GEN_DIR/third_party/perfetto/build_config \ $$CHROMIUM_SRC_DIR/third_party/abseil-cpp \ + $$CHROMIUM_SRC_DIR/third_party/perfetto/include \ $$CHROMIUM_SRC_DIR gcc: QMAKE_CXXFLAGS_WARN_ON = -Wno-unused-parameter |