From f8c1d339ecc905e8ee442129cb54a50be7ce1c24 Mon Sep 17 00:00:00 2001 From: Fabian Kosmale Date: Wed, 5 May 2021 16:56:31 +0200 Subject: [PATCH] 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 Reviewed-by: Alexandru Croitor --- tests/auto/tools/moc/tst_moc.cpp | 4 ++-- 1 file 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();