diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-01 13:23:30 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-02-21 14:49:01 +0000 |
| commit | e3501d6fba594276507109147dcba0f07e8eb214 (patch) | |
| tree | 9f2fdc3af3da1a759aea4d48a86499f8757fe102 | |
| parent | f7da41786ae57de984585ee7bc25edb3817c74ca (diff) | |
repc: Fix CMake Unity (Jumbo) builds
Remove some string constants which were only used once;
one of them (JSON) clashes with namespace JSON in utils.cpp.
Task-number: QTBUG-109394
Change-Id: Ie2a8dbbd33872e51fd912db596e5a8de01ed724a
Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io>
Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
(cherry picked from commit 1b9aa81d287ed1a3128987f5fd8937e787e7439c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | tools/repc/main.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/tools/repc/main.cpp b/tools/repc/main.cpp index 37b318c..0822f62 100644 --- a/tools/repc/main.cpp +++ b/tools/repc/main.cpp @@ -29,10 +29,6 @@ enum Mode { }; static const QLatin1String REP("rep"); -static const QLatin1String JSON("json"); -static const QLatin1String REPLICA("replica"); -static const QLatin1String SOURCE("source"); -static const QLatin1String MERGED("merged"); QT_USE_NAMESPACE @@ -97,7 +93,7 @@ int main(int argc, char **argv) const QString &inputType = parser.value(inputTypeOption); if (inputType == REP) mode = InRep; - else if (inputType == JSON) + else if (inputType == u"json") mode = InJson; else { fprintf(stderr, PROGRAM_NAME ": Unknown input type\"%s\".\n", qPrintable(inputType)); @@ -109,11 +105,11 @@ int main(int argc, char **argv) const QString &outputType = parser.value(outputTypeOption); if (outputType == REP) mode |= OutRep; - else if (outputType == REPLICA) + else if (outputType == u"replica") mode |= OutReplica; - else if (outputType == SOURCE) + else if (outputType == u"source") mode |= OutSource; - else if (outputType == MERGED) + else if (outputType == u"merged") mode |= OutMerged; else { fprintf(stderr, PROGRAM_NAME ": Unknown output type\"%s\".\n", qPrintable(outputType)); |