feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QtSupport: Fix compile

Browse Source 
Amends 22121885fe.

Change-Id: I1758e04561192855340dd5e850d8ddd498eff8b3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Christian Stenger
2021-07-14 12:43:23 +02:00
parent 324ff024d7
commit f490ea44fd
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qtsupport/qtprojectimporter.cpp
View File

@@ -271,7 +271,7 @@ void TestQtProjectImporter::deleteDirectoryData(void *directoryData) const
static Utils::FilePath setupQmake(const BaseQtVersion *qt, const QString &path) 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(); const QString qmakeFile = path + "/" + fi.fileName();
if (!QFile::copy(fi.absoluteFilePath(), qmakeFile)) if (!QFile::copy(fi.absoluteFilePath(), qmakeFile))
return Utils::FilePath(); return Utils::FilePath();
@@ -379,12 +379,12 @@ void QtSupportPlugin::testQtProjectImporter_oneProject()
SysRootKitAspect::setSysRoot(kitTemplates[1], Utils::FilePath::fromString("/some/path")); SysRootKitAspect::setSysRoot(kitTemplates[1], Utils::FilePath::fromString("/some/path"));
SysRootKitAspect::setSysRoot(kitTemplates[2], Utils::FilePath::fromString("/some/other/path")); SysRootKitAspect::setSysRoot(kitTemplates[2], Utils::FilePath::fromString("/some/other/path"));
QVector<Utils::FilePath> qmakePaths = {defaultQt->qmakeCommand(), QVector<Utils::FilePath> qmakePaths = {defaultQt->qmakeFilePath(),
setupQmake(defaultQt, tempDir1.path().path()), setupQmake(defaultQt, tempDir1.path().path()),
setupQmake(defaultQt, tempDir2.path().path())}; setupQmake(defaultQt, tempDir2.path().path())};
for (int i = 1; i < qmakePaths.count(); ++i) 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<DirectoryData *> testData; QList<DirectoryData *> testData;
@@ -457,7 +457,7 @@ void QtSupportPlugin::testQtProjectImporter_oneProject()
QVERIFY(newQt); QVERIFY(newQt);
// VALIDATE: Qt has the expected qmakePath // VALIDATE: Qt has the expected qmakePath
QCOMPARE(dd->qmakePath, newQt->qmakeCommand()); QCOMPARE(dd->qmakePath, newQt->qmakeFilePath());
// VALIDATE: All keys are unchanged: // VALIDATE: All keys are unchanged:
QList<Utils::Id> newKitKeys = newKit->allKeys(); QList<Utils::Id> newKitKeys = newKit->allKeys();
@@ -569,7 +569,7 @@ void QtSupportPlugin::testQtProjectImporter_oneProject()
QVERIFY(QtVersionManager::version(qtId)); QVERIFY(QtVersionManager::version(qtId));
// VALIDATE: Qt points to the expected qmake path: // 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 // VALIDATE: Kit uses the expected Qt
QCOMPARE(QtKitAspect::qtVersionId(newKit), qtId); QCOMPARE(QtKitAspect::qtVersionId(newKit), qtId);