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 --- src/lib/corelib/buildgraph/abstractcommandexecutor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/lib/corelib/buildgraph/abstractcommandexecutor.cpp') diff --git a/src/lib/corelib/buildgraph/abstractcommandexecutor.cpp b/src/lib/corelib/buildgraph/abstractcommandexecutor.cpp index cacea2d98..1ed5f21f3 100644 --- a/src/lib/corelib/buildgraph/abstractcommandexecutor.cpp +++ b/src/lib/corelib/buildgraph/abstractcommandexecutor.cpp @@ -39,7 +39,7 @@ #include "abstractcommandexecutor.h" -#include "command.h" +#include "rulecommands.h" #include #include -- cgit v1.2.3