1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: use configured paths for deployment defaults

Browse Source 
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 <joerg.bornemann@qt.io>
This commit is contained in:
Samuli Piippo 2025-05-08 15:16:42 +03:00
parent 0cd3be36ba
commit b2985828a3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/Qt6CoreMacros.cmake
View File

@ -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}\")