diff --git a/src/shared/CMakeLists.txt b/src/shared/CMakeLists.txt
index 90965fbd1cd..880430e3654 100644
--- a/src/shared/CMakeLists.txt
+++ b/src/shared/CMakeLists.txt
@@ -17,17 +17,8 @@ endif()
 
 option(BUILD_QBS "Build Qbs together with Qt Creator" ${BUILD_QBS_DEFAULT})
 
+add_feature_info("Build Qbs" 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}")
   set(QBS_OUTPUT_PREFIX "${_REL_PATH_TO_QTC}/" CACHE STRING "" FORCE)
   set(QBS_APP_INSTALL_DIR "${IDE_BIN_PATH}" CACHE STRING "" FORCE)
diff --git a/src/shared/qbs b/src/shared/qbs
index 893e985449b..24924ce845f 160000
--- a/src/shared/qbs
+++ b/src/shared/qbs
@@ -1 +1 @@
-Subproject commit 893e985449b1db91195966884f4b743bf08b3f9c
+Subproject commit 24924ce845f09281fdfcb9b02784d23326bdd2bd