diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-08-28 13:04:16 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-09-10 07:31:21 +0000 |
| commit | 8452264a186e94fe26a21bebf0f2d40d62891bbd (patch) | |
| tree | 199fead48cd345a906b6a8797f89b9ce5fba1a60 /src/plugins/autotest | |
| parent | a0352f24d0913c4a2852a9dbcd1c3bc9745801f8 (diff) | |
| download | qt-creator-8452264a186e94fe26a21bebf0f2d40d62891bbd.tar.gz | |
CppTools: Move QtVersion and BuildTargetType
QtVersion to utils/cpplanguage_details.h which already contains similar
flags.
BuildTargetType to ProjectExplorer, next to BuildTargetInfo (but not in the
same header to not pull that in everywhere).
Removes dependency on ProjectPart from RawProjectPart.
Change-Id: I5791065e4266f20c2657ee4b1b594df04b238a1c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Diffstat (limited to 'src/plugins/autotest')
| -rw-r--r-- | src/plugins/autotest/gtest/gtesttreeitem.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/autotest/quick/quicktesttreeitem.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/autotest/testtreeitem.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/autotest/gtest/gtesttreeitem.cpp b/src/plugins/autotest/gtest/gtesttreeitem.cpp index c344669b3c..fdae1fa309 100644 --- a/src/plugins/autotest/gtest/gtesttreeitem.cpp +++ b/src/plugins/autotest/gtest/gtesttreeitem.cpp @@ -486,7 +486,7 @@ QSet<QString> GTestTreeItem::internalTargets() const return pf.path == file; })) { result.insert(projectPart->buildSystemTarget); - if (projectPart->buildTargetType != CppTools::ProjectPart::Executable) + if (projectPart->buildTargetType != ProjectExplorer::BuildTargetType::Executable) result.unite(TestTreeItem::dependingInternalTargets(cppMM, file)); } } diff --git a/src/plugins/autotest/quick/quicktesttreeitem.cpp b/src/plugins/autotest/quick/quicktesttreeitem.cpp index d896b56a3c..bb09159af1 100644 --- a/src/plugins/autotest/quick/quicktesttreeitem.cpp +++ b/src/plugins/autotest/quick/quicktesttreeitem.cpp @@ -418,7 +418,7 @@ QSet<QString> QuickTestTreeItem::internalTargets() const const auto cppMM = CppTools::CppModelManager::instance(); const auto projectInfo = cppMM->projectInfo(ProjectExplorer::SessionManager::startupProject()); for (const CppTools::ProjectPart::Ptr &projectPart : projectInfo.projectParts()) { - if (projectPart->buildTargetType != CppTools::ProjectPart::Executable) + if (projectPart->buildTargetType != ProjectExplorer::BuildTargetType::Executable) continue; if (projectPart->projectFile == proFile()) { result.insert(projectPart->buildSystemTarget); diff --git a/src/plugins/autotest/testtreeitem.cpp b/src/plugins/autotest/testtreeitem.cpp index b3db358f5e..4dd62f88ec 100644 --- a/src/plugins/autotest/testtreeitem.cpp +++ b/src/plugins/autotest/testtreeitem.cpp @@ -317,7 +317,7 @@ QSet<QString> TestTreeItem::internalTargets() const QSet<QString> targets; for (const CppTools::ProjectPart::Ptr &part : projectParts) { targets.insert(part->buildSystemTarget); - if (part->buildTargetType != CppTools::ProjectPart::Executable) + if (part->buildTargetType != ProjectExplorer::BuildTargetType::Executable) targets.unite(TestTreeItem::dependingInternalTargets(cppMM, m_filePath)); } return targets; |