diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2021-05-25 13:13:36 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2021-05-25 14:40:56 +0000 |
| commit | f71472d37e93a54be78c91ae1770204a4de273ea (patch) | |
| tree | fc5cf22b9d86cd7c93ac3e07a8cd014f8eacc2f4 | |
| parent | 7bfc8458499897842caf2aa6b2e333e18a02ed21 (diff) | |
Add missing dependecies, update shas
Include WebChannel,Positioning cmake packages into WebEngineQuick
and WebEngineWidgets. WebEngineCore depends on it so this should
be pick up automatically, but in the case of clean build and due to
how things work in cmake this is required otherwise linker
genex will complain.
Change-Id: I54fe8ffdb824e1fd0c0dcdfbbb43b1bcf06411bb
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | dependencies.yaml | 33 | ||||
| -rw-r--r-- | src/core/api/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/webenginequick/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/webenginewidgets/CMakeLists.txt | 2 |
4 files changed, 22 insertions, 21 deletions
diff --git a/dependencies.yaml b/dependencies.yaml index 7e2950afd..0e581781c 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,25 +1,22 @@ dependencies: ../qtbase: - ref: 640eb55c130c6c2c982dc212a8a5bd2b8fb7a225 + ref: 13c8db52a2e16ba525396bb7853de94ac50d6acf required: true ../qtshadertools: - ref: cf08b62f103b8e2bc3e9a117ccd262d7a278a260 + ref: fa040b42d723223cf0bb75ff785ec1c91b3f595e required: true ../qtdeclarative: - ref: 3e9cece90ae7097bbf915ef1e941390abecf28a8 + ref: 05e684cf008346c4a12172184e1f9e7503fbeeca required: true -# ../qtlocation: -# ref: a8793c6d9695498b3a53793f21859421262b4541 -# required: false -# ../qtquickcontrols: -# ref: 59749d56d666a6687fcedc2f7892080467db8574 -# required: false -# ../qtquickcontrols2: -# ref: 9a19ec26f45e7382431f52136f03887cfaa04b66 -# required: false -# ../qttools: -# ref: 3fd594493c3ba31639a7515b901554456a90b4c7 -# required: false -# ../qtwebchannel: -# ref: 0e13bd10bc7f31b1540987faeb0e3c83668daa3e -# required: false + ../qtlocation: + ref: 9bc9ddf2ab35f1f5ff6bda8695fbd871fd57122e + required: false + ../qtquickcontrols2: + ref: 40ee2118802f777b48262e71086b2a7c930d140a + required: false + ../qttools: + ref: b388defafbb6c9d834e4e3ea45926e4d9efd7c84 + required: false + ../qtwebchannel: + ref: f6020e4c78a55e612d4144d1035d9b6896eaedb3 + required: false diff --git a/src/core/api/CMakeLists.txt b/src/core/api/CMakeLists.txt index 3ee45af0f..5df3ba7b9 100644 --- a/src/core/api/CMakeLists.txt +++ b/src/core/api/CMakeLists.txt @@ -2,7 +2,7 @@ if(NOT DEFINED WEBENGINE_ROOT_SOURCE_DIR) get_filename_component(WEBENGINE_ROOT_SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/../../.." REALPATH) endif() find_package(Qt6 ${PROJECT_VERSION} REQUIRED COMPONENTS Gui Network OpenGL Quick) -find_package(Qt6 ${PROJECT_VERSION} QUIET OPTIONAL_COMPONENTS PrintSupport WebChannel) +find_package(Qt6 ${PROJECT_VERSION} QUIET OPTIONAL_COMPONENTS PrintSupport WebChannel Positioning) include(${WEBENGINE_ROOT_SOURCE_DIR}/cmake/Functions.cmake) get_configure_mode(configureMode) @@ -72,3 +72,7 @@ qt_internal_extend_target(WebEngineCore CONDITION QT_FEATURE_webengine_webchanne PUBLIC_LIBRARIES Qt::WebChannel ) +qt_internal_extend_target(WebEngineCore CONDITION QT_FEATURE_webengine_geolocation + PUBLIC_LIBRARIES + Qt::Positioning +) diff --git a/src/webenginequick/CMakeLists.txt b/src/webenginequick/CMakeLists.txt index aeb2882a1..c00eb18fb 100644 --- a/src/webenginequick/CMakeLists.txt +++ b/src/webenginequick/CMakeLists.txt @@ -1,5 +1,5 @@ find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS Gui Qml Quick) -find_package(Qt6 ${PROJECT_VERSION} CONFIG QUIET OPTIONAL_COMPONENTS PrintSupport) +find_package(Qt6 ${PROJECT_VERSION} CONFIG QUIET OPTIONAL_COMPONENTS PrintSupport WebChannel Positioning) get_configure_mode(configureMode) diff --git a/src/webenginewidgets/CMakeLists.txt b/src/webenginewidgets/CMakeLists.txt index 5274a45bf..f37948c8c 100644 --- a/src/webenginewidgets/CMakeLists.txt +++ b/src/webenginewidgets/CMakeLists.txt @@ -1,5 +1,5 @@ find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS Gui Widgets Quick QuickWidgets) -find_package(Qt6 ${PROJECT_VERSION} CONFIG QUIET OPTIONAL_COMPONENTS PrintSupport) +find_package(Qt6 ${PROJECT_VERSION} CONFIG QUIET OPTIONAL_COMPONENTS PrintSupport WebChannel Positioning) get_configure_mode(configureMode) |