diff --git a/src/plugins/clangcodemodel/test/clangbatchfileprocessor.cpp b/src/plugins/clangcodemodel/test/clangbatchfileprocessor.cpp index 79cc8ff81ab..9afcf0d9a95 100644 --- a/src/plugins/clangcodemodel/test/clangbatchfileprocessor.cpp +++ b/src/plugins/clangcodemodel/test/clangbatchfileprocessor.cpp @@ -234,7 +234,7 @@ bool OpenProjectCommand::run() QTC_ASSERT(openProjectSucceeded, return false); Project *project = openProjectSucceeded.project(); - project->configureAsExampleProject({}); + project->configureAsExampleProject(); return CppTools::Tests::TestCase::waitUntilCppModelManagerIsAwareOf(project, timeOutInMs()); } diff --git a/src/plugins/cpptools/cpptoolstestcase.cpp b/src/plugins/cpptools/cpptoolstestcase.cpp index 5ed334b2e84..72dfa8551c3 100644 --- a/src/plugins/cpptools/cpptoolstestcase.cpp +++ b/src/plugins/cpptools/cpptoolstestcase.cpp @@ -291,7 +291,7 @@ ProjectInfo ProjectOpenerAndCloser::open(const QString &projectFile, bool config Project *project = result.project(); if (configureAsExampleProject) - project->configureAsExampleProject({ }); + project->configureAsExampleProject(); if (TestCase::waitUntilCppModelManagerIsAwareOf(project)) { m_openProjects.append(project); diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp index f34547cc951..25735971a95 100644 --- a/src/plugins/projectexplorer/project.cpp +++ b/src/plugins/projectexplorer/project.cpp @@ -844,9 +844,8 @@ bool Project::needsBuildConfigurations() const return true; } -void Project::configureAsExampleProject(const QSet &platforms) +void Project::configureAsExampleProject() { - Q_UNUSED(platforms); } bool Project::knowsAllBuildExecutables() const diff --git a/src/plugins/projectexplorer/project.h b/src/plugins/projectexplorer/project.h index a7e2ad2a926..26e02c9b37a 100644 --- a/src/plugins/projectexplorer/project.h +++ b/src/plugins/projectexplorer/project.h @@ -156,7 +156,7 @@ public: virtual bool needsConfiguration() const; virtual bool needsBuildConfigurations() const; - virtual void configureAsExampleProject(const QSet &platforms); + virtual void configureAsExampleProject(); virtual ProjectImporter *projectImporter() const; diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp index 917f9d564f9..1c11238e9e9 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.cpp +++ b/src/plugins/qbsprojectmanager/qbsproject.cpp @@ -713,20 +713,15 @@ QString QbsProject::uniqueProductName(const qbs::ProductData &product) return product.name() + QLatin1Char('.') + product.multiplexConfigurationId(); } -void QbsProject::configureAsExampleProject(const QSet &platforms) +void QbsProject::configureAsExampleProject() { QList infoList; - QList kits = KitManager::kits(); - const auto qtVersionMatchesPlatform = [platforms](const QtSupport::BaseQtVersion *version) { - return platforms.isEmpty() || platforms.intersects(version->targetDeviceTypes()); - }; - foreach (Kit *k, kits) { - const QtSupport::BaseQtVersion * const qtVersion - = QtSupport::QtKitAspect::qtVersion(k); - if (!qtVersion || !qtVersionMatchesPlatform(qtVersion)) - continue; - if (auto factory = BuildConfigurationFactory::find(k, projectFilePath())) - infoList << factory->allAvailableSetups(k, projectFilePath()); + const QList kits = KitManager::kits(); + for (Kit *k : kits) { + if (QtSupport::QtKitAspect::qtVersion(k) != nullptr) { + if (auto factory = BuildConfigurationFactory::find(k, projectFilePath())) + infoList << factory->allAvailableSetups(k, projectFilePath()); + } } setup(infoList); prepareForParsing(); diff --git a/src/plugins/qbsprojectmanager/qbsproject.h b/src/plugins/qbsprojectmanager/qbsproject.h index 8489cd708a5..bd59b03a59d 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.h +++ b/src/plugins/qbsprojectmanager/qbsproject.h @@ -98,7 +98,7 @@ public: static QString uniqueProductName(const qbs::ProductData &product); - void configureAsExampleProject(const QSet &platforms) final; + void configureAsExampleProject() final; void delayParsing(); diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index f4bcecea3d9..6f5925b51b4 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -938,19 +938,15 @@ void CentralizedFolderWatcher::delayedFolderChanged(const QString &folder) m_project->updateCodeModels(); } -void QmakeProject::configureAsExampleProject(const QSet &platforms) +void QmakeProject::configureAsExampleProject() { QList infoList; - QList kits = KitManager::kits(); - foreach (Kit *k, kits) { - QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(k); - if (!version - || (!platforms.isEmpty() - && !Utils::contains(version->targetDeviceTypes(), [platforms](Core::Id i) { return platforms.contains(i); }))) - continue; - - if (auto factory = BuildConfigurationFactory::find(k, projectFilePath())) - infoList << factory->allAvailableSetups(k, projectFilePath()); + const QList kits = KitManager::kits(); + for (Kit *k : kits) { + if (QtSupport::QtKitAspect::qtVersion(k) != nullptr) { + if (auto factory = BuildConfigurationFactory::find(k, projectFilePath())) + infoList << factory->allAvailableSetups(k, projectFilePath()); + } } setup(infoList); } diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.h b/src/plugins/qmakeprojectmanager/qmakeproject.h index 42e8e57ec03..835496d176a 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.h +++ b/src/plugins/qmakeprojectmanager/qmakeproject.h @@ -95,7 +95,7 @@ public: void watchFolders(const QStringList &l, QmakePriFile *file); void unwatchFolders(const QStringList &l, QmakePriFile *file); - void configureAsExampleProject(const QSet &platforms) final; + void configureAsExampleProject() final; void emitBuildDirectoryInitialized(); static void proFileParseError(const QString &errorMessage);