diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-01-25 11:12:37 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-02-23 17:02:30 +0100 |
| commit | 1f30bcf33618ca39c47dc1058529b55635e30aef (patch) | |
| tree | ab6f07d6c8afba7d0b9bcd06b17f2b307719d8bb /tests/auto/tools/moc/tst_moc.cpp | |
| parent | 700d1037aa38f71813826e5104533f357fc41e04 (diff) | |
Move build tools to libexec instead of the bin dir
[ChangeLog][Build System] Tools that are called by the build system and
are unlikely to be called by the user are now installed to the libexec
directory.
This is a step towards easier co-installability of different Qt
versions.
Pick-to: 6.1
Task-number: QTBUG-88791
Change-Id: Id19575b5ba27795f7715e4ea6a09391b26dd4942
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'tests/auto/tools/moc/tst_moc.cpp')
| -rw-r--r-- | tests/auto/tools/moc/tst_moc.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/tools/moc/tst_moc.cpp b/tests/auto/tools/moc/tst_moc.cpp index 3a0eed0a64..8ce2382600 100644 --- a/tests/auto/tools/moc/tst_moc.cpp +++ b/tests/auto/tools/moc/tst_moc.cpp @@ -775,7 +775,8 @@ void tst_Moc::initTestCase() { QString binpath = QLibraryInfo::path(QLibraryInfo::BinariesPath); QString qmake = QString("%1/qmake").arg(binpath); - m_moc = QString("%1/moc").arg(binpath); + QString libexecPath = QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath); + m_moc = QString("%1/moc").arg(libexecPath); const QString testHeader = QFINDTESTDATA("backslash-newlines.h"); QVERIFY(!testHeader.isEmpty()); |