From 018d77678641c452a00b321527794027e4e5d92b Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 5 Aug 2021 11:26:10 +0200 Subject: CMake: Fix incorrect dependency on private modules Public modules shouldn't propagate private modules as usage requirements. Pick-to: 6.2 Fixes: QTBUG-93428 Change-Id: Ic7aca0e8a6469604722596782e87d92d7e510e9e Reviewed-by: Qt CI Bot Reviewed-by: Mike Krus --- examples/qt3d/3d-text/3d-text.pro | 2 +- examples/qt3d/3d-text/CMakeLists.txt | 1 - src/extras/CMakeLists.txt | 6 ++++-- src/quick3d/quick3danimation/CMakeLists.txt | 9 ++++++--- src/quick3d/quick3dextras/CMakeLists.txt | 9 ++++++--- src/quick3d/quick3dinput/CMakeLists.txt | 9 ++++++--- src/quick3d/quick3drender/CMakeLists.txt | 9 ++++++--- src/quick3d/quick3dscene2d/CMakeLists.txt | 9 ++++++--- 8 files changed, 35 insertions(+), 19 deletions(-) diff --git a/examples/qt3d/3d-text/3d-text.pro b/examples/qt3d/3d-text/3d-text.pro index 7fa771df4..0e5453a3b 100644 --- a/examples/qt3d/3d-text/3d-text.pro +++ b/examples/qt3d/3d-text/3d-text.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += core gui 3dcore 3drender 3dinput 3dextras 3drender-private +QT += core gui 3dcore 3drender 3dinput 3dextras SOURCES += main.cpp diff --git a/examples/qt3d/3d-text/CMakeLists.txt b/examples/qt3d/3d-text/CMakeLists.txt index 24021f14c..79d3b4d20 100644 --- a/examples/qt3d/3d-text/CMakeLists.txt +++ b/examples/qt3d/3d-text/CMakeLists.txt @@ -34,7 +34,6 @@ target_link_libraries(3d-text PUBLIC Qt::3DExtras Qt::3DInput Qt::3DRender - Qt::3DRenderPrivate Qt::Core Qt::Gui ) 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 ) -- cgit v1.2.3