Skip to content
  • Tobias Hunger's avatar
    qmake: fix missing OTHER_FILES in project tree · 624339ea
    Tobias Hunger authored and Oswald Buddenhagen's avatar Oswald Buddenhagen committed
    
    
    ... in subdirs projects which actually have any subdirs.
    
    that would happen via this mechanism in QmakeProFileNode::evaluate():
    first, IncludedPriFile nodes with proFile = null are created for the
    subdirs. subsequently, this tree is enriched by transforming the
    reader's included files. that loop iterates over all already created
    nodes and tries to match them against included files. at nesting level
    one, this would now run into the nodes created for the subdirs. the code
    failed to skip over these nodes, and would thus create a bogus node for
    the .pro file (as it has the parent null in the mapping of included
    files). this node would not be included into the tree due to the loop
    prevention in QmakeProFileNode::applyEvaluate() (it obviously had the
    same file path as its parent), but at the same time it would catch the
    files meant for the root node due to defeating the fallback in
    QmakePriFileNode::extractSources().
    
    Task-number: QTCREATORBUG-17473
    Change-Id: Ice9f667345148be42297cc21ff0a73058f27cc38
    Reviewed-by: default avatarTobias Hunger <tobias.hunger@qt.io>
    624339ea