From b2985828a37acb9420ed396ffb7b1a850f943683 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 8 May 2025 15:16:42 +0300 Subject: [PATCH] CMake: use configured paths for deployment defaults The deployment api was using hardcoded paths for qml and plugin files by default. This led to problems when deploying to embedded linux where those paths were configured differently ('lib/qml' instead of 'qml'). Pick-to: 6.9 6.8 Fixes: QTBUG-136678 Change-Id: I2c3eb10858350062c86cea62fc812f095796527e Reviewed-by: Joerg Bornemann --- src/corelib/Qt6CoreMacros.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index dd0653fc04a..7fb701c088a 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -3162,13 +3162,13 @@ if(NOT QT_DEPLOY_LIB_DIR) set(QT_DEPLOY_LIB_DIR \"${CMAKE_INSTALL_LIBDIR}\") endif() if(NOT QT_DEPLOY_PLUGINS_DIR) - set(QT_DEPLOY_PLUGINS_DIR \"plugins\") + set(QT_DEPLOY_PLUGINS_DIR \"${QT6_INSTALL_PLUGINS}\") endif() if(NOT QT_DEPLOY_QML_DIR) - set(QT_DEPLOY_QML_DIR \"qml\") + set(QT_DEPLOY_QML_DIR \"${QT6_INSTALL_QML}\") endif() if(NOT QT_DEPLOY_TRANSLATIONS_DIR) - set(QT_DEPLOY_TRANSLATIONS_DIR \"translations\") + set(QT_DEPLOY_TRANSLATIONS_DIR \"${QT6_INSTALL_TRANSLATIONS}\") endif() if(NOT QT_DEPLOY_PREFIX) set(QT_DEPLOY_PREFIX \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}\")