aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/compiler/qv4compilerscanfunctions.cpp
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2022-12-21 09:57:03 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-01-06 19:50:03 +0000
commit65b32630352c651441af9de849bba891efc97fd2 (patch)
tree4bce960d7f91995dd59d1aac5a28bdaa81b3e154 /src/qml/compiler/qv4compilerscanfunctions.cpp
parent76e81a3ba4f6d3109530328d655c117454217a2c (diff)
CMake: Avoid repeating DESTDIR when deploying QML plugins
Let CMAKE_INSTALL_PREFIX be "/usr/local", and consider a project with a call to qt_generate_deploy_app_script. Installing the project with DESTDIR set to "/tmp/bla" would install the project targets to "/tmp/bla/usr/local" but Qt's QML modules to "/tmp/bla/tmp/bla/usr/local". That happened, because we used QT_DEPLOY_PREFIX as DESTINATION in file(INSTALL). QT_DEPLOY_PREFIX starts with $ENV{DESTDIR} and file(INSTALL) also prepends DESTDIR. The value of QT_DEPLOY_PREFIX is controlled by CMAKE_INSTALL_PREFIX. Use the latter as DESTINATION in file(INSTALL) calls. Task-number: QTBUG-109553 Change-Id: I8f06d81968fa0de4f17c4f8bc9b17cc052da4c12 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io> Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit b6fd3191c1c0fa1697c90b0457e3f9523bbad11d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/qml/compiler/qv4compilerscanfunctions.cpp')
0 files changed, 0 insertions, 0 deletions