From 26f7119767870b4ac8c0eca8711f213170313887 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Thu, 1 Dec 2016 00:50:22 -0800 Subject: 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 --- tests/auto/cmdlineparser/cmdlineparser.qbs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/auto/cmdlineparser') diff --git a/tests/auto/cmdlineparser/cmdlineparser.qbs b/tests/auto/cmdlineparser/cmdlineparser.qbs index ddd0e62ce..d18982389 100644 --- a/tests/auto/cmdlineparser/cmdlineparser.qbs +++ b/tests/auto/cmdlineparser/cmdlineparser.qbs @@ -14,8 +14,6 @@ QbsAutotest { name: "parser" prefix: "../../../src/app/qbs/parser/" files: [ - "command.cpp", - "command.h", "commandlineoption.cpp", "commandlineoption.h", "commandlineoptionpool.cpp", @@ -25,6 +23,8 @@ QbsAutotest { "commandpool.cpp", "commandpool.h", "commandtype.h", + "parsercommand.cpp", + "parsercommand.h", ] } } -- cgit v1.2.3