From f490ea44fde5c7c3d193eef75da05d39e331768a Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Wed, 14 Jul 2021 12:43:23 +0200 Subject: [PATCH] QtSupport: Fix compile Amends 22121885feb7c686eb64. Change-Id: I1758e04561192855340dd5e850d8ddd498eff8b3 Reviewed-by: Tim Jenssen --- src/plugins/qtsupport/qtprojectimporter.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/plugins/qtsupport/qtprojectimporter.cpp b/src/plugins/qtsupport/qtprojectimporter.cpp index 2ed2a6ac6bb..19e9054fb43 100644 --- a/src/plugins/qtsupport/qtprojectimporter.cpp +++ b/src/plugins/qtsupport/qtprojectimporter.cpp @@ -271,7 +271,7 @@ void TestQtProjectImporter::deleteDirectoryData(void *directoryData) const static Utils::FilePath setupQmake(const BaseQtVersion *qt, const QString &path) { - const QFileInfo fi = QFileInfo(qt->qmakeCommand().toFileInfo().canonicalFilePath()); + const QFileInfo fi = QFileInfo(qt->qmakeFilePath().toFileInfo().canonicalFilePath()); const QString qmakeFile = path + "/" + fi.fileName(); if (!QFile::copy(fi.absoluteFilePath(), qmakeFile)) return Utils::FilePath(); @@ -379,12 +379,12 @@ void QtSupportPlugin::testQtProjectImporter_oneProject() SysRootKitAspect::setSysRoot(kitTemplates[1], Utils::FilePath::fromString("/some/path")); SysRootKitAspect::setSysRoot(kitTemplates[2], Utils::FilePath::fromString("/some/other/path")); - QVector qmakePaths = {defaultQt->qmakeCommand(), + QVector qmakePaths = {defaultQt->qmakeFilePath(), setupQmake(defaultQt, tempDir1.path().path()), setupQmake(defaultQt, tempDir2.path().path())}; for (int i = 1; i < qmakePaths.count(); ++i) - QVERIFY(!QtVersionManager::version(Utils::equal(&BaseQtVersion::qmakeCommand, qmakePaths.at(i)))); + QVERIFY(!QtVersionManager::version(Utils::equal(&BaseQtVersion::qmakeFilePath, qmakePaths.at(i)))); QList testData; @@ -457,7 +457,7 @@ void QtSupportPlugin::testQtProjectImporter_oneProject() QVERIFY(newQt); // VALIDATE: Qt has the expected qmakePath - QCOMPARE(dd->qmakePath, newQt->qmakeCommand()); + QCOMPARE(dd->qmakePath, newQt->qmakeFilePath()); // VALIDATE: All keys are unchanged: QList newKitKeys = newKit->allKeys(); @@ -569,7 +569,7 @@ void QtSupportPlugin::testQtProjectImporter_oneProject() QVERIFY(QtVersionManager::version(qtId)); // VALIDATE: Qt points to the expected qmake path: - QCOMPARE(QtVersionManager::version(qtId)->qmakeCommand(), dd->qmakePath); + QCOMPARE(QtVersionManager::version(qtId)->qmakeFilePath(), dd->qmakePath); // VALIDATE: Kit uses the expected Qt QCOMPARE(QtKitAspect::qtVersionId(newKit), qtId);