diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2021-05-05 16:56:31 +0200 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2021-05-05 23:43:45 +0200 |
| commit | f8c1d339ecc905e8ee442129cb54a50be7ce1c24 (patch) | |
| tree | 5aad8607c99fcf503b6656f83674b9706c5b1a62 /tests/auto/tools | |
| parent | fb56cf449b665aa5c9cfd88a92937279a7dd8a54 (diff) | |
tst_moc: Use qtpaths instead of qmake
We only need to the location of certain paths for the test. For that,
qtpaths is sufficient.
Change-Id: I5af0d56b548629edc48949150ed8fbd408b617a6
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'tests/auto/tools')
| -rw-r--r-- | tests/auto/tools/moc/tst_moc.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/tools/moc/tst_moc.cpp b/tests/auto/tools/moc/tst_moc.cpp index 3c59502bf6..01417ff3dc 100644 --- a/tests/auto/tools/moc/tst_moc.cpp +++ b/tests/auto/tools/moc/tst_moc.cpp @@ -779,7 +779,7 @@ private: void tst_Moc::initTestCase() { QString binpath = QLibraryInfo::path(QLibraryInfo::BinariesPath); - QString qmake = QString("%1/qmake").arg(binpath); + QString qtpaths = QString("%1/qtpaths").arg(binpath); QString libexecPath = QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath); m_moc = QString("%1/moc").arg(libexecPath); @@ -788,7 +788,7 @@ void tst_Moc::initTestCase() m_sourceDirectory = QFileInfo(testHeader).absolutePath(); #if defined(Q_OS_UNIX) && QT_CONFIG(process) QProcess proc; - proc.start(qmake, QStringList() << "-query" << "QT_INSTALL_HEADERS"); + proc.start(qtpaths, QStringList() << "-query" << "QT_INSTALL_HEADERS"); QVERIFY(proc.waitForFinished()); QCOMPARE(proc.exitCode(), 0); QByteArray output = proc.readAllStandardOutput(); |