aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/cmdlineparser
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@qt.io>2016-12-01 00:50:22 -0800
committerJake Petroules <jake.petroules@qt.io>2017-01-05 11:06:18 +0000
commit26f7119767870b4ac8c0eca8711f213170313887 (patch)
treef00224572fb94be53430bf9e1384c91990c21c9b /tests/auto/cmdlineparser
parenteee738fa94293d9f17bb337e7740f990ab2c67a9 (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 'tests/auto/cmdlineparser')
-rw-r--r--tests/auto/cmdlineparser/cmdlineparser.qbs4
1 files changed, 2 insertions, 2 deletions
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",
]
}
}