feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Remove QtScript from condition for building Qbs

Browse Source 
It works without nowadays, and even with Qt 6, with its
bundled QtScript version.

Update Qbs to HEAD of 1.20 for a build fix.

Change-Id: I060ddec595c989852dc5861594423d5ffa5f521d
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Eike Ziller
2021-08-16 10:28:03 +02:00
parent 263d8fb5d7
commit e4995fd6c7
2 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/shared/CMakeLists.txt
View File

@@ -17,17 +17,8 @@ endif()
option(BUILD_QBS "Build Qbs together with Qt Creator" ${BUILD_QBS_DEFAULT}) option(BUILD_QBS "Build Qbs together with Qt Creator" ${BUILD_QBS_DEFAULT})
add_feature_info("Build Qbs" BUILD_QBS "")
if (BUILD_QBS) if (BUILD_QBS)
find_package(Qt5 COMPONENTS Script QUIET)
if (TARGET Qt5::Script)
set(ENABLE_BUILD_QBS YES)
endif()
else()
set(ENABLE_BUILD_QBS NO)
endif()
add_feature_info("Build Qbs" ENABLE_BUILD_QBS "with CONDITION TARGET Qt5::Script")
if (ENABLE_BUILD_QBS)
file(RELATIVE_PATH _REL_PATH_TO_QTC "${CMAKE_BINARY_DIR}" "${PROJECT_BINARY_DIR}") 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_OUTPUT_PREFIX "${_REL_PATH_TO_QTC}/" CACHE STRING "" FORCE)
set(QBS_APP_INSTALL_DIR "${IDE_BIN_PATH}" CACHE STRING "" FORCE) set(QBS_APP_INSTALL_DIR "${IDE_BIN_PATH}" CACHE STRING "" FORCE)

2
src/shared/qbs

Submodule src/shared/qbs updated: 893e985449...24924ce845