diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-01-30 14:37:56 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-01 19:12:36 +0100 |
commit | 93af309a707ea2ab133e281d837ac37b1351fb47 (patch) | |
tree | 94df72f4d45bea7b70c3b76f8a88fd9b80e6a218 /examples/corelib/serialization/convert/xmlconverter.cpp | |
parent | ddb94dd7927126978fc2a620ebd91954e2f96862 (diff) |
Examples: Fix CMake Unity (Jumbo) builds
Disambiguate variables and add some exclusions.
Pick-to: 6.5
Task-number: QTBUG-109394
Change-Id: Ie72b3caab9fd571c3fb6f7d8606584885bc09e66
Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io>
Diffstat (limited to 'examples/corelib/serialization/convert/xmlconverter.cpp')
-rw-r--r-- | examples/corelib/serialization/convert/xmlconverter.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/examples/corelib/serialization/convert/xmlconverter.cpp b/examples/corelib/serialization/convert/xmlconverter.cpp index d4a11257c6..080528f678 100644 --- a/examples/corelib/serialization/convert/xmlconverter.cpp +++ b/examples/corelib/serialization/convert/xmlconverter.cpp @@ -13,7 +13,7 @@ #include <QXmlStreamReader> #include <QXmlStreamWriter> -static const char optionHelp[] = +static const char xmlOptionHelp[] = "compact=no|yes Use compact XML form.\n"; static XmlConverter xmlConverter; @@ -416,7 +416,7 @@ Converter::Options XmlConverter::outputOptions() const char *XmlConverter::optionsHelp() { - return optionHelp; + return xmlOptionHelp; } bool XmlConverter::probeFile(QIODevice *f) @@ -454,7 +454,8 @@ void XmlConverter::saveFile(QIODevice *f, const QVariant &contents, const QStrin } else if (s == QLatin1String("compact=yes")) { compact = true; } else { - fprintf(stderr, "Unknown option '%s' to XML output. Valid options are:\n%s", qPrintable(s), optionHelp); + fprintf(stderr, "Unknown option '%s' to XML output. Valid options are:\n%s", + qPrintable(s), xmlOptionHelp); exit(EXIT_FAILURE); } } |