diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-06-02 10:40:48 (GMT) |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-06-02 10:44:42 (GMT) |
| commit | f001cda07f6aa026d59e448b49212c0182ed895c (patch) | |
| tree | ec2939a40ce1dcc53d31ef0a6a18e584209a83bc /dist | |
| parent | fa5a8defd6b1449b81bd67a6b22a398e0d1ed366 (diff) | |
| download | Qt-f001cda07f6aa026d59e448b49212c0182ed895c.zip Qt-f001cda07f6aa026d59e448b49212c0182ed895c.tar.gz Qt-f001cda07f6aa026d59e448b49212c0182ed895c.tar.bz2 | |
Removed an ifdef in QLocale that breaks the One Definition Rule.
From a merge request #553 by Gordon Schumacher:
During a build internal to Qt, if a header included by qlocale.cpp
itself includes qlocale.h, then QLOCALE_CPP will never be set. If you
attempt to build qmake from its own .pro file, qmake_pch.h includes
qtextstream.h, which (now) includes qlocale.h, thus causing a compile
error trying to call the QSystemLocale(bool) function
Inspired-by: Gordon Schumacher <gordon@rebit.com>
Diffstat (limited to 'dist')
0 files changed, 0 insertions, 0 deletions