aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2025-11-06 10:05:03 +0100
committerEike Ziller <eike.ziller@qt.io>2025-11-06 11:56:22 +0000
commitda584fb752b8434cb97caede70e1d9afbd65671a (patch)
tree98889e32fa2e68c24997abe0859ad109d1704c5a
parentd06dc327d87b00e9a2d3555fec0ef03066be0a2b (diff)
Build/GitHub: Build sdktool
As a direct component of the Qt Creator build. Fixes: QTCREATORBUG-33353 Change-Id: Id03d1525a026667ede944ad2e6f9a73a68e48a2e Reviewed-by: Cristian Adam <cristian.adam@qt.io>
-rw-r--r--.github/workflows/build_cmake.yml1
-rwxr-xr-xscripts/build.py3
2 files changed, 3 insertions, 1 deletions
diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml
index 14e3583bfe3..d4f327ed1a8 100644
--- a/.github/workflows/build_cmake.yml
+++ b/.github/workflows/build_cmake.yml
@@ -661,6 +661,7 @@ jobs:
--add-config=-DIDE_REVISION_URL=https://github.com/$ENV{GITHUB_REPOSITORY}/commits/$ENV{GITHUB_SHA}
--zip-infix=-${{ matrix.config.artifact }}-${{ steps.git.outputs.tag }}
--no-qbs
+ --with-sdk-tool
${WITH_CPACK}
RESULT_VARIABLE result
COMMAND_ECHO STDOUT
diff --git a/scripts/build.py b/scripts/build.py
index 1cee0320bde..fab0b2b1152 100755
--- a/scripts/build.py
+++ b/scripts/build.py
@@ -70,7 +70,8 @@ def get_arguments():
action='store_true', default=False)
parser.add_argument('--with-cpack', help='Create packages with cpack',
action='store_true', default=False)
- parser.add_argument('--with-sdk-tool', help='Builds a internal sdk-tool (not standalone) which is used in Qt Design Studio builds',
+ parser.add_argument('--with-sdk-tool', help='Includes the sdktool in the Qt Creator build. '
+ 'If you want a independent, standalone, static build of sdktool, use build_sdktool.py instead.',
action='store_true', default=False)
parser.add_argument('--add-path', help='Prepends a CMAKE_PREFIX_PATH to the build',
action='append', dest='prefix_paths', default=[])