diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-01-26 13:46:21 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-02 21:57:49 +0100 |
| commit | d3f8d7fd4140b269532e2daca8eb5cbfe28ed465 (patch) | |
| tree | 957d11b44a56faa9b1b4f3c84f3d8495cf618050 /src/corelib/serialization/qxmlstream.cpp | |
| parent | 9d2f3e63b86b48fd402aa126569746c9111f5ccc (diff) | |
QtCore: Disambiguate static variables
They cause clashes in CMake Unity (Jumbo) builds.
Pick-to: 6.5
Task-number: QTBUG-109394
Change-Id: I5f1fbee07872a742a78adc9864fe00c710ca24d0
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/serialization/qxmlstream.cpp')
| -rw-r--r-- | src/corelib/serialization/qxmlstream.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/serialization/qxmlstream.cpp b/src/corelib/serialization/qxmlstream.cpp index 0b5843f032a..82212a54094 100644 --- a/src/corelib/serialization/qxmlstream.cpp +++ b/src/corelib/serialization/qxmlstream.cpp @@ -1853,7 +1853,7 @@ void QXmlStreamReaderPrivate::parseError() int ers = state_stack[tos]; int nexpected = 0; int expected[nmax]; - if (token != ERROR) + if (token != XML_ERROR) for (int tk = 0; tk < TERMINAL_COUNT; ++tk) { int k = t_action(ers, tk); if (k <= 0) |