diff options
| author | Jonathan Liu <net147@gmail.com> | 2013-03-14 02:24:32 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-18 21:48:10 (GMT) |
| commit | 3fe6a74576f8c0c4e04343e0db94364f76fea407 (patch) | |
| tree | badedb2ec5a31d6bb7e09aa7d938dbd4d6cbdf45 /src/corelib/thread | |
| parent | ab50a0677e14d1bad12a18f0b0b9f963c8162e78 (diff) | |
| download | Qt-3fe6a74576f8c0c4e04343e0db94364f76fea407.zip Qt-3fe6a74576f8c0c4e04343e0db94364f76fea407.tar.gz Qt-3fe6a74576f8c0c4e04343e0db94364f76fea407.tar.bz2 | |
WebKit: Fix using macro to determine Mac user agent architecture
Using || operator with #ifdef is incorrect. As a result, the
architecture for the user agent is incorrectly set to PPC on an Intel
Mac.
This is a partial backport of r128775 in WebKit upstream.
Task-number: QTBUG-30187
Change-Id: I6842f113fd024ababaf67e76dfee8f93e0988d08
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'src/corelib/thread')
0 files changed, 0 insertions, 0 deletions