From 93af309a707ea2ab133e281d837ac37b1351fb47 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Mon, 30 Jan 2023 14:37:56 +0100
Subject: Examples: Fix CMake Unity (Jumbo) builds
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 examples/corelib/serialization/convert/cborconverter.cpp       | 6 +++---
 examples/corelib/serialization/convert/datastreamconverter.cpp | 6 +++---
 examples/corelib/serialization/convert/jsonconverter.cpp       | 7 ++++---
 examples/corelib/serialization/convert/xmlconverter.cpp        | 7 ++++---
 4 files changed, 14 insertions(+), 12 deletions(-)

(limited to 'examples/corelib/serialization/convert')

diff --git a/examples/corelib/serialization/convert/cborconverter.cpp b/examples/corelib/serialization/convert/cborconverter.cpp
index 8c88d42af3..85ca8c12ed 100644
--- a/examples/corelib/serialization/convert/cborconverter.cpp
+++ b/examples/corelib/serialization/convert/cborconverter.cpp
@@ -19,7 +19,7 @@
 static CborConverter cborConverter;
 static CborDiagnosticDumper cborDiagnosticDumper;
 
-static const char optionHelp[] =
+static const char cborOptionHelp[] =
         "convert-float-to-int=yes|no    Write integers instead of floating point, if no\n"
         "                               loss of precision occurs on conversion.\n"
         "float16=yes|always|no          Write using half-precision floating point.\n"
@@ -207,7 +207,7 @@ Converter::Options CborConverter::outputOptions()
 
 const char *CborConverter::optionsHelp()
 {
-    return optionHelp;
+    return cborOptionHelp;
 }
 
 bool CborConverter::probeFile(QIODevice *f)
@@ -314,7 +314,7 @@ void CborConverter::saveFile(QIODevice *f, const QVariant &contents, const QStri
         }
 
         fprintf(stderr, "Unknown CBOR format option '%s'. Valid options are:\n%s",
-                qPrintable(s), optionHelp);
+                qPrintable(s), cborOptionHelp);
         exit(EXIT_FAILURE);
     }
     //! [4]
diff --git a/examples/corelib/serialization/convert/datastreamconverter.cpp b/examples/corelib/serialization/convert/datastreamconverter.cpp
index 9322d97fef..451688e378 100644
--- a/examples/corelib/serialization/convert/datastreamconverter.cpp
+++ b/examples/corelib/serialization/convert/datastreamconverter.cpp
@@ -7,7 +7,7 @@
 #include <QDebug>
 #include <QTextStream>
 
-static const char optionHelp[] =
+static const char dataStreamOptionHelp[] =
         "byteorder=host|big|little      Byte order to use.\n"
         "version=<n>                    QDataStream version (default: Qt 5.0).\n"
         ;
@@ -143,7 +143,7 @@ Converter::Options DataStreamConverter::outputOptions()
 
 const char *DataStreamConverter::optionsHelp()
 {
-    return optionHelp;
+    return dataStreamOptionHelp;
 }
 
 bool DataStreamConverter::probeFile(QIODevice *f)
@@ -209,7 +209,7 @@ void DataStreamConverter::saveFile(QIODevice *f, const QVariant &contents, const
         }
 
         fprintf(stderr, "Unknown QDataStream formatting option '%s'. Available options are:\n%s",
-                qPrintable(option), optionHelp);
+                qPrintable(option), dataStreamOptionHelp);
         exit(EXIT_FAILURE);
     }
 
diff --git a/examples/corelib/serialization/convert/jsonconverter.cpp b/examples/corelib/serialization/convert/jsonconverter.cpp
index 26f48661a9..f52c9db554 100644
--- a/examples/corelib/serialization/convert/jsonconverter.cpp
+++ b/examples/corelib/serialization/convert/jsonconverter.cpp
@@ -11,7 +11,7 @@
 
 static JsonConverter jsonConverter;
 
-static const char optionHelp[] =
+static const char jsonOptionHelp[] =
         "compact=no|yes              Use compact JSON form.\n";
 
 static QJsonDocument convertFromVariant(const QVariant &v)
@@ -45,7 +45,7 @@ Converter::Options JsonConverter::outputOptions()
 
 const char *JsonConverter::optionsHelp()
 {
-    return optionHelp;
+    return jsonOptionHelp;
 }
 
 bool JsonConverter::probeFile(QIODevice *f)
@@ -96,7 +96,8 @@ void JsonConverter::saveFile(QIODevice *f, const QVariant &contents, const QStri
         } else if (s == QLatin1String("compact=yes")) {
             format = QJsonDocument::Compact;
         } else {
-            fprintf(stderr, "Unknown option '%s' to JSON output. Valid options are:\n%s", qPrintable(s), optionHelp);
+            fprintf(stderr, "Unknown option '%s' to JSON output. Valid options are:\n%s",
+                    qPrintable(s), jsonOptionHelp);
             exit(EXIT_FAILURE);
         }
     }
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);
         }
     }
-- 
cgit v1.2.3