diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2021-06-15 06:02:54 +0000 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2021-06-15 09:39:20 +0000 |
| commit | 051c3a4df0ab8febd9fca23184eade82b73fdf7f (patch) | |
| tree | 5c00303a011883c834482961f26b91939637106a | |
| parent | 8e41c0533e253a616dbe119163015191a40f5bda (diff) | |
Revert "Move qtattributionsscanner to libexec" for 6.1.2
This reverts commit 4c2614611612a054a981144209d1295e37bcaf04.
Reason for revert: Let's keep this for Qt 6.2 and following releases,
and not do it in a patch level release.
Fixes: QTBUG-94510
Change-Id: Ic698100b0a1440dc6c0e8c3b16394fecb991862c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| -rw-r--r-- | src/qtattributionsscanner/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/auto/qtattributionsscanner/tst_qtattributionsscanner.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/qtattributionsscanner/CMakeLists.txt b/src/qtattributionsscanner/CMakeLists.txt index 8aa87b4f7..14a7af28c 100644 --- a/src/qtattributionsscanner/CMakeLists.txt +++ b/src/qtattributionsscanner/CMakeLists.txt @@ -8,7 +8,6 @@ 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 34611c221..017d6a255 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::LibraryExecutablesPath); + QString binPath = QLibraryInfo::path(QLibraryInfo::BinariesPath); m_cmd = binPath + QLatin1String("/qtattributionsscanner"); m_basePath = QFINDTESTDATA("testdata"); } |