diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-08-05 11:26:10 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-08-05 11:46:21 +0000 |
| commit | 169d684aa3947dcba6b54d97979685fe858068a5 (patch) | |
| tree | d6b0df79470740348009ce2617b014d3306b0074 /src | |
| parent | ad0a6b92dc688dc4f39e815f2d1e812e5a5562a3 (diff) | |
CMake: Fix incorrect dependency on private modules
Public modules shouldn't propagate private modules as usage
requirements.
Fixes: QTBUG-93428
Change-Id: Ic7aca0e8a6469604722596782e87d92d7e510e9e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mike Krus <mike.krus@kdab.com>
(cherry picked from commit 018d77678641c452a00b321527794027e4e5d92b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/extras/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/quick3d/quick3danimation/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | src/quick3d/quick3dextras/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | src/quick3d/quick3dinput/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | src/quick3d/quick3drender/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | src/quick3d/quick3dscene2d/CMakeLists.txt | 9 |
6 files changed, 34 insertions, 17 deletions
diff --git a/src/extras/CMakeLists.txt b/src/extras/CMakeLists.txt index 6d40ce101..85d480a5e 100644 --- a/src/extras/CMakeLists.txt +++ b/src/extras/CMakeLists.txt @@ -67,17 +67,19 @@ qt_internal_add_module(3DExtras geometries text LIBRARIES + Qt::3DCorePrivate + Qt::3DRenderPrivate Qt::CorePrivate PUBLIC_LIBRARIES Qt::Core Qt::Gui Qt::3DCore - Qt::3DCorePrivate Qt::3DInput Qt::3DLogic Qt::3DRender - Qt::3DRenderPrivate PRIVATE_MODULE_INTERFACE + Qt::3DCorePrivate + Qt::3DRenderPrivate Qt::CorePrivate ) diff --git a/src/quick3d/quick3danimation/CMakeLists.txt b/src/quick3d/quick3danimation/CMakeLists.txt index 3f17462fc..5d033f4f6 100644 --- a/src/quick3d/quick3danimation/CMakeLists.txt +++ b/src/quick3d/quick3danimation/CMakeLists.txt @@ -18,20 +18,23 @@ qt_internal_add_module(3DQuickAnimation INCLUDE_DIRECTORIES items LIBRARIES + Qt::3DCorePrivate + Qt::3DQuickPrivate + Qt::3DRenderPrivate Qt::CorePrivate Qt::QmlPrivate PUBLIC_LIBRARIES Qt::3DAnimation Qt::3DCore - Qt::3DCorePrivate Qt::3DQuick - Qt::3DQuickPrivate Qt::3DRender - Qt::3DRenderPrivate Qt::Core Qt::Gui Qt::Qml PRIVATE_MODULE_INTERFACE + Qt::3DCorePrivate + Qt::3DQuickPrivate + Qt::3DRenderPrivate Qt::CorePrivate Qt::QmlPrivate ) diff --git a/src/quick3d/quick3dextras/CMakeLists.txt b/src/quick3d/quick3dextras/CMakeLists.txt index 0312127dc..9d5703f57 100644 --- a/src/quick3d/quick3dextras/CMakeLists.txt +++ b/src/quick3d/quick3dextras/CMakeLists.txt @@ -16,22 +16,25 @@ qt_internal_add_module(3DQuickExtras INCLUDE_DIRECTORIES items LIBRARIES + Qt::3DExtrasPrivate + Qt::3DQuickPrivate + Qt::3DRenderPrivate Qt::CorePrivate Qt::QmlPrivate PUBLIC_LIBRARIES Qt::3DCore Qt::3DExtras - Qt::3DExtrasPrivate Qt::3DInput 3DLogic Qt::3DQuick - Qt::3DQuickPrivate Qt::3DRender - Qt::3DRenderPrivate Qt::Core Qt::Gui Qt::Qml PRIVATE_MODULE_INTERFACE + Qt::3DExtrasPrivate + Qt::3DQuickPrivate + Qt::3DRenderPrivate Qt::CorePrivate Qt::QmlPrivate ) diff --git a/src/quick3d/quick3dinput/CMakeLists.txt b/src/quick3d/quick3dinput/CMakeLists.txt index 2c03d2409..f93dc3414 100644 --- a/src/quick3d/quick3dinput/CMakeLists.txt +++ b/src/quick3d/quick3dinput/CMakeLists.txt @@ -17,19 +17,22 @@ qt_internal_add_module(3DQuickInput INCLUDE_DIRECTORIES items LIBRARIES + Qt::3DCorePrivate + Qt::3DInputPrivate + Qt::3DQuickPrivate Qt::CorePrivate Qt::QmlPrivate PUBLIC_LIBRARIES Qt::3DCore - Qt::3DCorePrivate Qt::3DInput - Qt::3DInputPrivate Qt::3DQuick - Qt::3DQuickPrivate Qt::Core Qt::Gui Qt::Qml PRIVATE_MODULE_INTERFACE + Qt::3DCorePrivate + Qt::3DInputPrivate + Qt::3DQuickPrivate Qt::CorePrivate Qt::QmlPrivate ) diff --git a/src/quick3d/quick3drender/CMakeLists.txt b/src/quick3d/quick3drender/CMakeLists.txt index 5c8685fad..330222053 100644 --- a/src/quick3d/quick3drender/CMakeLists.txt +++ b/src/quick3d/quick3drender/CMakeLists.txt @@ -32,19 +32,22 @@ qt_internal_add_module(3DQuickRender INCLUDE_DIRECTORIES items LIBRARIES + Qt::3DCorePrivate + Qt::3DQuickPrivate + Qt::3DRenderPrivate Qt::CorePrivate Qt::QmlPrivate PUBLIC_LIBRARIES Qt::3DCore - Qt::3DCorePrivate Qt::3DQuick - Qt::3DQuickPrivate Qt::3DRender - Qt::3DRenderPrivate Qt::Core Qt::Gui Qt::Qml PRIVATE_MODULE_INTERFACE + Qt::3DCorePrivate + Qt::3DQuickPrivate + Qt::3DRenderPrivate Qt::CorePrivate Qt::QmlPrivate ) diff --git a/src/quick3d/quick3dscene2d/CMakeLists.txt b/src/quick3d/quick3dscene2d/CMakeLists.txt index 42046a7e7..a93460641 100644 --- a/src/quick3d/quick3dscene2d/CMakeLists.txt +++ b/src/quick3d/quick3dscene2d/CMakeLists.txt @@ -18,19 +18,22 @@ qt_internal_add_module(3DQuickScene2D INCLUDE_DIRECTORIES items LIBRARIES + Qt::3DCorePrivate + Qt::3DQuickPrivate + Qt::3DRenderPrivate Qt::CorePrivate Qt::QmlPrivate PUBLIC_LIBRARIES Qt::3DCore - Qt::3DCorePrivate Qt::3DQuick - Qt::3DQuickPrivate Qt::3DRender - Qt::3DRenderPrivate Qt::Core Qt::Gui Qt::Qml PRIVATE_MODULE_INTERFACE + Qt::3DCorePrivate + Qt::3DQuickPrivate + Qt::3DRenderPrivate Qt::CorePrivate Qt::QmlPrivate ) |