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

Fix platform definition directory in top-level build

Browse Source 
QT_BUILD_DIR should be used instead of CMAKE_BINARY_DIR as a base
directory for platform definition when building a non-prefixed
build since artifacts are copied to qtbase directory for top-level
build.

Amends 478f5fcde66a49b710c427447916a0ee0e4d9e0a

Task-number: QTBUG-94973
Change-Id: I5cce16fdc7f760b954222ae67a4b85d4beea7f13
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 9bbca531ebe498afa10d9a1c02518fcfc54490a2)
This commit is contained in:
Alexey Edelev 2021-07-06 15:50:06 +02:00 committed by Alexey Edelev
parent 943b561c32
commit c90d5e7420
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/QtBuild.cmake
View File

@ -342,7 +342,7 @@ set(QT_PLATFORM_DEFINITION_BUILD_INTERFACE_BASE_DIR
# Used by qtbase and consumers in non-prefix builds via BUILD_INTERFACE
if(NOT QT_WILL_INSTALL)
set(QT_PLATFORM_DEFINITION_BUILD_INTERFACE_BASE_DIR
"${CMAKE_BINARY_DIR}/${INSTALL_MKSPECSDIR}"
"${QT_BUILD_DIR}/${INSTALL_MKSPECSDIR}"
)
endif()