diff options
| author | Kai Köhne <kai.koehne@qt.io> | 2021-03-30 14:15:22 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-05-31 14:14:52 +0000 |
| commit | 4c2614611612a054a981144209d1295e37bcaf04 (patch) | |
| tree | 2ba316cec6c1d9ee9f3c6c07f0f6e7dd34ab53bf | |
| parent | 109949978f3958b3532f51a805beb699affc228c (diff) | |
Move qtattributionsscanner to libexec
The tool is only used for building the Qt documentation, and not
documented.
This requires a follow-up patch in qtbase.
Task-number: QTBUG-88791
Change-Id: I4a37249087a890e7fdb47ed6a2d89daec43d74dc
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 0861ee9e695300645e098c331428ae3a256e74e5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/qtattributionsscanner/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/auto/qtattributionsscanner/tst_qtattributionsscanner.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/qtattributionsscanner/CMakeLists.txt b/src/qtattributionsscanner/CMakeLists.txt index 14a7af28c..8aa87b4f7 100644 --- a/src/qtattributionsscanner/CMakeLists.txt +++ b/src/qtattributionsscanner/CMakeLists.txt @@ -8,6 +8,7 @@ qt_get_tool_target_name(target_name qtattributionsscanner) qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt Source Code Attribution Scanner" TOOLS_TARGET Tools # special case + INSTALL_DIR "${INSTALL_LIBEXECDIR}" SOURCES jsongenerator.cpp jsongenerator.h logging.h diff --git a/tests/auto/qtattributionsscanner/tst_qtattributionsscanner.cpp b/tests/auto/qtattributionsscanner/tst_qtattributionsscanner.cpp index 017d6a255..34611c221 100644 --- a/tests/auto/qtattributionsscanner/tst_qtattributionsscanner.cpp +++ b/tests/auto/qtattributionsscanner/tst_qtattributionsscanner.cpp @@ -56,7 +56,7 @@ private: tst_qtattributionsscanner::tst_qtattributionsscanner() { - QString binPath = QLibraryInfo::path(QLibraryInfo::BinariesPath); + QString binPath = QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath); m_cmd = binPath + QLatin1String("/qtattributionsscanner"); m_basePath = QFINDTESTDATA("testdata"); } |