summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Köhne <kai.koehne@qt.io>2021-07-13 17:04:03 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2022-11-17 16:06:39 +0200
commit35a31b5ccb6960ee23185d11849b443d27eadc31 (patch)
treeceafbf96aeb05b038e8f271c8d222e757f18d352
parent266ec89d11dd9168ec6f8a187bdef5976e52ecb9 (diff)
Move qscxmlc to libexec
The compiler is usually not called manually, but through the build system. Fixes: QTBUG-101777 Task-number: QTBUG-88791 Change-Id: I5077b8110e2a840b2e97a922988bfa6f286a1a1f Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit b2f6bcec5125b099345a521735bc1e820ce8f310)
-rw-r--r--mkspecs/features/qscxmlc.prf2
-rw-r--r--tools/qscxmlc/CMakeLists.txt1
2 files changed, 2 insertions, 1 deletions
diff --git a/mkspecs/features/qscxmlc.prf b/mkspecs/features/qscxmlc.prf
index ae1b3ba..a807937 100644
--- a/mkspecs/features/qscxmlc.prf
+++ b/mkspecs/features/qscxmlc.prf
@@ -1,4 +1,4 @@
-qtPrepareTool(QMAKE_QSCXMLC, qscxmlc)
+qtPrepareLibExecTool(QMAKE_QSCXMLC, qscxmlc)
isEmpty(QSCXMLC_DIR):QSCXMLC_DIR = .
diff --git a/tools/qscxmlc/CMakeLists.txt b/tools/qscxmlc/CMakeLists.txt
index ea05ad6..c7ee648 100644
--- a/tools/qscxmlc/CMakeLists.txt
+++ b/tools/qscxmlc/CMakeLists.txt
@@ -8,6 +8,7 @@ qt_internal_include_in_repo_target_set(qtscxml)
qt_get_tool_target_name(target_name qscxmlc)
qt_internal_add_tool(${target_name}
TOOLS_TARGET Scxml
+ INSTALL_DIR "${INSTALL_LIBEXECDIR}"
SOURCES
../../src/scxml/qscxmlcompiler.cpp ../../src/scxml/qscxmlcompiler.h ../../src/scxml/qscxmlcompiler_p.h
../../src/scxml/qscxmlerror.cpp ../../src/scxml/qscxmlerror.h