Commit Graph

11 Commits

Author SHA1 Message Date
Tobias Hunger
f4659ecc82 qmake: Introduce tree structure into QmakePriFiles
Change-Id: I0071c54a08d4775a34ab91e61be25f98352a5ed0
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 11:02:18 +00:00
Tobias Hunger
69684d9f9c qmake: Rename QmakeParser*FileNode to Qmake*File
Change-Id: I7598ccf93ed21a6d6650db76b17d745a2739b18c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 11:02:04 +00:00
Tobias Hunger
574669d333 qmake: Move more code into anonymous namespace
Change-Id: I9178c29637ae76e57ba885de671d11418284c3e2
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 10:10:17 +00:00
Tobias Hunger
48b7966d75 qmake: Remove InternalParserNode again
The parser nodes do not need to represent the actual project
tree, so there is no need to keep the tree-structure. Store
the list of files instead.

Change-Id: I83e036d4b9b42e4186b4ef23ac573865942ee97e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-15 10:10:07 +00:00
Tobias Hunger
13d71a9f6b qmake: Use logging category instead of debug enum
Change-Id: I4f8718656453a3a369780fb555f33235d652a0e8
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-15 09:03:16 +00:00
Tobias Hunger
eaaf9522c6 qmake: remove some unnecessary members from QmakeParserPriFileNode
Replace them with member functions providing the same information.

Change-Id: If65bb99c77df0f80562b4559914f4b81ab17a166
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-15 09:03:08 +00:00
Tobias Hunger
671e1626da qmake: QmakeParserPriFileNode: Use unique_ptr
Use unique_ptr to hold the QmakePriFileDocument. That makes
it clearer that QmakePriFileNode owns it.

Change-Id: Ia31778ad2a9d33a13cf818d3bcad0485ebfa2043
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-15 09:03:03 +00:00
Tobias Hunger
e376424b33 qmake: Rename QmakeParserPriFile to QmakePriFileDocument
Makes it clearer what that actually is.

Change-Id: I2b50deba53ae5cef2bf1a30b9497c1867559e1e9
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-15 09:02:58 +00:00
Tobias Hunger
086733a2c9 qmake: Use ProjectType enum consistently
Change-Id: I633a7150202fcbf420a33b4173d2b4451f46eb11
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-14 15:40:11 +00:00
Tobias Hunger
1878ff40ac qmake: Fix WS
Change-Id: I15f64b8c773446e7d1d3a980c9215f710b095ad9
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-14 15:40:04 +00:00
Tobias Hunger
20e86c810e qmake: Introduce QMakeParserNodes
Introduce QmakeParser*FileNodes by copying Qmake*FileNodes and renaming
things so that nothing conflicts and both sets of Nodes can be built at
the same time.

The goal of this patchset is to disentangle the project parsing from the
project structure as shown in the project tree.

Change-Id: I4e7383b71849ed4de15d29a45c9b249aa2319a27
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-14 15:39:47 +00:00