Commit Graph

16 Commits

Author SHA1 Message Date
Christian Kandeler
63e395c876 QbsProjectManager: Fix object files appearing in locator
This bug got re-introduced by commit fc5ce1e710.

Task-number: QTCREATORBUG-17382
Change-Id: I6114ca8f4305b3c0e356f4849094ecb1ccca7601
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-05-08 12:55:39 +00:00
Tobias Hunger
72f769c9ba Qbs: Make QbsNodeTreeBuilder handled uninitialized project
Make QbsNodeTreeBuilder handle uninitialized projects more gracefully.

Return a nullptr, so that the ContainerNode with the main project file
is used in that case.

Change-Id: I7ab90231c3fc24b7b676326f98f79c4b79018327
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-04-28 14:17:03 +00:00
Christian Kandeler
660c4ced86 QbsProjectManager: Fix collecting unreferenced build system files
We cannot use std::set_difference on a QSet, because those are not
sorted.

Change-Id: I6238a2bd06bcc6e5dba64572f0c3b0caaa57a7eb
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-04-13 09:21:37 +00:00
Christian Kandeler
4b39baa8c1 QbsProjectManager: Add project file nodes for sub-projects
They got lost somehow during the project tree refactoring.

Task-number: QTCREATORBUG-17859
Change-Id: I1d1178c3d0932322604e7035f15dcc4490309ca9
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-04-13 09:19:36 +00:00
Christian Kandeler
b520a90644 QbsProjectManager: Add unreferenced build system files to the right node
They ended up as children of the root node somehow during refactoring.

Change-Id: I2da3ac74369fd9456b62839f1498f84f0034a85c
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-04-13 09:19:04 +00:00
Joerg Bornemann
848b8c0f44 Update qbs submodule
To HEAD of 1.8 branch, and adapt to changed API.

Change-Id: Ie180b114726134a06dfefe9dc3a6dc27997f246c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-03-31 14:44:49 +00:00
hjk
58214f09e3 QbsProjectManager: Code cosmetics
Remove unused QbsProductNode::findGroupNode and productPath.
Also, simplify setup of static icons.

Change-Id: Ibfaa1398eefcf3f764173d5b37aa4382b68976c9
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-21 12:49:46 +00:00
Orgad Shaneh
5b9eaf747d QbsPM: Add nodes incrementally
Change-Id: Id53a0107df64b26d8ec57eda734635bda9e045f6
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-14 15:51:12 +00:00
Tobias Hunger
6815633dff Qbs: Fix build after update to ProjectNodes
Change-Id: Ibb736901596a7295f50059f5dd448a2b5da32e85
Reviewed-by: hjk <hjk@qt.io>
2017-03-14 15:25:00 +00:00
Tobias Hunger
7648504a30 FolderNode: Remove makeEmpty() again
It is no longer necessary.

Change-Id: Id044ace6f0861bc0fc659fb6d6823da1f0082bc9
Reviewed-by: hjk <hjk@qt.io>
2017-03-10 16:44:23 +00:00
Tobias Hunger
2fde3fffa9 Make all projects generate a fresh project tree
Do not update the existing project tree anymore: Start a fresh one
and throw the old one away.

Change-Id: Ifabe293b6ca668b0672516a6d81acd5346d98fe5
Reviewed-by: hjk <hjk@qt.io>
2017-03-10 16:22:26 +00:00
Christian Kandeler
b151e94dea QbsProjectManager: Fix soft asserts
Change-Id: I4efef985bc8bd2652a5ea4d6b54a5d4ee8d4941f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-03-10 15:20:08 +00:00
Tobias Hunger
45ffa75054 Qbs: Move root project setup into QbsNodeTreeBuilder
Change-Id: If8ba7fc6e4edf1346e0636d0bbc78efb27cb433e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-03-02 15:07:21 +00:00
Tobias Hunger
8cb57c734e Qbs: Move setup code for QbsProjectNodes into QbsNodeTreeBuilder
Change-Id: Ice5b445db916648bb8fb0d0f31bafe1d53e11182
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-03-02 15:07:14 +00:00
Tobias Hunger
b6b7605357 Qbs: Move ProductNode setup into QbsNodeTreeBuilder
Move closer to a setup where the project tree API can change.

This patch also makes sure "Generated files" will be below the
product file of each product and above any Groups/folders/files.

Change-Id: I728289372d40b809105f55adbe50fd424b19e0a0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-03-02 15:07:03 +00:00
Tobias Hunger
7b3db8ee1d qbs: Move setup of Group node tree into QbsNodeTreeBuilder
Move code to set up the tree of project nodes out of the project
nodes themselves. This makes them easier to manage and will enable
creator to change to a less update-intense project tree.

Change-Id: I2d0702d257e87543f47ebfb456344423ebe4f871
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-03-02 15:06:59 +00:00