diff options
| author | Kai Köhne <kai.koehne@qt.io> | 2021-03-30 14:38:10 +0200 |
|---|---|---|
| committer | Kai Köhne <kai.koehne@qt.io> | 2021-05-11 08:48:11 +0200 |
| commit | c4425426278c1f5e94d51b465a746ab6a5ff74d7 (patch) | |
| tree | 81ceb2727330b7737ab3651aea8e1b0767d0aa85 /tools | |
| parent | 4c236f12f952711f3f4b7f9eccef82c8a87a0a0e (diff) | |
Move tools to libexec
Move qmlimportscanner, qmltyperegistrar, qmljsrootgen, qmlcachegen to libexec
These are internal tools that is not supposed to be run by the user directly.
[ChangeLog][Linux] qmlimportscanner, qmltyperegistrar, qmljsrootgen,
qmlcachegen tools got moved from QTDIR/bin into QTDIR/libexec
directory.
Task-number: QTBUG-88791
Change-Id: I2739044e872ec83ef7da7dd857c26395ecfd407d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmlcachegen/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tools/qmlcachegen/qmlcache.prf | 2 | ||||
| -rw-r--r-- | tools/qmlcachegen/qtquickcompiler.prf | 2 | ||||
| -rw-r--r-- | tools/qmlimportscanner/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tools/qmljsrootgen/CMakeLists.txt | 1 |
5 files changed, 5 insertions, 2 deletions
diff --git a/tools/qmlcachegen/CMakeLists.txt b/tools/qmlcachegen/CMakeLists.txt index e0ae4c4092..8739992dd7 100644 --- a/tools/qmlcachegen/CMakeLists.txt +++ b/tools/qmlcachegen/CMakeLists.txt @@ -8,6 +8,7 @@ qt_get_tool_target_name(target_name qmlcachegen) qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Cache Generator" TOOLS_TARGET Qml # special case + INSTALL_DIR "${INSTALL_LIBEXECDIR}" SOURCES qmlcachegen.cpp DEFINES diff --git a/tools/qmlcachegen/qmlcache.prf b/tools/qmlcachegen/qmlcache.prf index 537eaf62ea..0f0d291dfd 100644 --- a/tools/qmlcachegen/qmlcache.prf +++ b/tools/qmlcachegen/qmlcache.prf @@ -3,7 +3,7 @@ static { return() } -qtPrepareTool(QML_CACHEGEN, qmlcachegen, _ARCH_CHECK) +qtPrepareLibExecTool(QML_CACHEGEN, qmlcachegen, _ARCH_CHECK) isEmpty(TARGETPATH): error("Must set TARGETPATH (QML import name) for ahead-of-time QML cache generation") diff --git a/tools/qmlcachegen/qtquickcompiler.prf b/tools/qmlcachegen/qtquickcompiler.prf index 0b88fba86e..262ed08785 100644 --- a/tools/qmlcachegen/qtquickcompiler.prf +++ b/tools/qmlcachegen/qtquickcompiler.prf @@ -10,7 +10,7 @@ if(qtc_run|lupdate_run): return() unset(qt_modules) } -qtPrepareTool(QML_CACHEGEN, qmlcachegen, _FILTER) +qtPrepareLibExecTool(QML_CACHEGEN, qmlcachegen, _FILTER) qtPrepareLibExecTool(QMAKE_RCC, rcc, _DEP) isEmpty(QMLCACHE_DIR): QMLCACHE_DIR = . diff --git a/tools/qmlimportscanner/CMakeLists.txt b/tools/qmlimportscanner/CMakeLists.txt index 61e927b6fe..eb00026bc1 100644 --- a/tools/qmlimportscanner/CMakeLists.txt +++ b/tools/qmlimportscanner/CMakeLists.txt @@ -8,6 +8,7 @@ qt_get_tool_target_name(target_name qmlimportscanner) qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Import Scanner" TOOLS_TARGET Qml # special case + INSTALL_DIR "${INSTALL_LIBEXECDIR}" SOURCES main.cpp DEFINES diff --git a/tools/qmljsrootgen/CMakeLists.txt b/tools/qmljsrootgen/CMakeLists.txt index 5126f6f091..357000b969 100644 --- a/tools/qmljsrootgen/CMakeLists.txt +++ b/tools/qmljsrootgen/CMakeLists.txt @@ -2,6 +2,7 @@ qt_get_tool_target_name(target_name qmljsrootgen) qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Global Object Metatypes Generator" TOOLS_TARGET Qml # special case + INSTALL_DIR "${INSTALL_LIBEXECDIR}" SOURCES main.cpp PUBLIC_LIBRARIES |