diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2016-12-01 00:50:22 -0800 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-01-05 11:06:18 +0000 |
| commit | 26f7119767870b4ac8c0eca8711f213170313887 (patch) | |
| tree | f00224572fb94be53430bf9e1384c91990c21c9b /src/lib/corelib/corelib.qbs | |
| parent | eee738fa94293d9f17bb337e7740f990ab2c67a9 (diff) | |
Give the two copies command.{cpp,h} non-ambiguous names
The pair in tools/buildgraph becomes rulecommands.{cpp,h}
The pair in parser becomes parsercommand.{cpp,h}
This resolves a conflict which prevented compilation of the entire
set of qbs sources with MSVC and the /Fo option.
Change-Id: Ic909d02a230d8e59f3bf4d00fc895bf54739961a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/lib/corelib/corelib.qbs')
| -rw-r--r-- | src/lib/corelib/corelib.qbs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/corelib/corelib.qbs b/src/lib/corelib/corelib.qbs index 3d3cade35..0d370e99c 100644 --- a/src/lib/corelib/corelib.qbs +++ b/src/lib/corelib/corelib.qbs @@ -105,8 +105,6 @@ QbsLibrary { "buildgraphloader.cpp", "buildgraphloader.h", "buildgraphvisitor.h", - "command.cpp", - "command.h", "cycledetector.cpp", "cycledetector.h", "depscanner.cpp", @@ -140,6 +138,8 @@ QbsLibrary { "rawscanneddependency.h", "rescuableartifactdata.cpp", "rescuableartifactdata.h", + "rulecommands.cpp", + "rulecommands.h", "rulegraph.cpp", "rulegraph.h", "rulenode.cpp", |