diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-05-08 10:57:10 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-05-08 15:19:14 +0000 |
| commit | 1b7337d23dbc767ba482d9051180f10d77052913 (patch) | |
| tree | 17d5810d3b04779a7de55e0cdf3de334de25c3e5 /src/tools/qlalr/lalr.h | |
| parent | c580644fe91148f0cb5fde44d262678ef47c5faa (diff) | |
qlalr: Fix startup crash in static builds
Replace the global variables qout, qerr by a functions to delay
the initialization.
Task-number: QTBUG-68166
Change-Id: Ib023da1bccc7eabc6e633ccb8945e5f209c5765e
Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/tools/qlalr/lalr.h')
| -rw-r--r-- | src/tools/qlalr/lalr.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/tools/qlalr/lalr.h b/src/tools/qlalr/lalr.h index b303b897d4..6a2baaa462 100644 --- a/src/tools/qlalr/lalr.h +++ b/src/tools/qlalr/lalr.h @@ -501,9 +501,8 @@ QTextStream &operator << (QTextStream &out, const Item &item); QTextStream &operator << (QTextStream &out, const NameSet &ns); QT_BEGIN_NAMESPACE -// ... hmm -extern QTextStream qerr; -extern QTextStream qout; +QTextStream &qerr(); +QTextStream &qout(); QT_END_NAMESPACE #endif // LALR_H |