From 897157b4a68b5c39d402048d32ba0d9805deef10 Mon Sep 17 00:00:00 2001 From: Andreas Reischuck Date: Thu, 10 Aug 2023 21:46:28 +0200 Subject: [PATCH] added qbs qt install dir --- src/shared/CMakeLists.txt | 1 + src/shared/qbs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/shared/CMakeLists.txt b/src/shared/CMakeLists.txt index 93409b0bf45..1e680e57763 100644 --- a/src/shared/CMakeLists.txt +++ b/src/shared/CMakeLists.txt @@ -16,6 +16,7 @@ if (BUILD_QBS) file(RELATIVE_PATH _REL_PATH_TO_QTC "${CMAKE_BINARY_DIR}" "${PROJECT_BINARY_DIR}") set(QBS_OUTPUT_PREFIX "${_REL_PATH_TO_QTC}/" CACHE STRING "" FORCE) set(QBS_APP_INSTALL_DIR "${IDE_BIN_PATH}" CACHE STRING "" FORCE) + set(QBS_QT_INSTALL_DIR "/${IDE_LIBRARY_BASE_PATH}/Qt/lib" CACHE STRING "" FORCE) set(QBS_LIB_INSTALL_DIR "${IDE_LIBRARY_PATH}" CACHE STRING "" FORCE) set(QBS_DLL_INSTALL_DIR "${IDE_BIN_PATH}" CACHE STRING "" FORCE) set(QBS_LIBEXEC_INSTALL_DIR "${IDE_LIBEXEC_PATH}" CACHE STRING "" FORCE) diff --git a/src/shared/qbs b/src/shared/qbs index fb1cffac07b..4aa2da4f751 160000 --- a/src/shared/qbs +++ b/src/shared/qbs @@ -1 +1 @@ -Subproject commit fb1cffac07bb3a17d4216f3b7bbdcdeb82092760 +Subproject commit 4aa2da4f7519b017dedb3fa5e96157a9c42f0230