diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-14 09:05:42 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-14 09:06:31 +0200 |
| commit | 5c23199d4e8ff21661dfa5aacc13149178e78cab (patch) | |
| tree | 322aee61581d7c85f1ccb65e47d1e79eba1ba6c9 /src/corelib/tools/qlocale_tools.cpp | |
| parent | 252bad7c589e03d3e12df02354b00a84d8e3159a (diff) | |
| parent | c8d9b17367cfdcb034d11f8a168ca4ae3993e7c3 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
configure
mkspecs/macx-xcode/Info.plist.app
mkspecs/macx-xcode/Info.plist.lib
qmake/doc/qmake.qdocconf
src/corelib/global/qglobal.h
tests/auto/other/exceptionsafety/exceptionsafety.pro
tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
Change-Id: I3c769a4a82dc2e99a12c69123fbf17613fd2ac2a
Diffstat (limited to 'src/corelib/tools/qlocale_tools.cpp')
| -rw-r--r-- | src/corelib/tools/qlocale_tools.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/corelib/tools/qlocale_tools.cpp b/src/corelib/tools/qlocale_tools.cpp index 6b716b356f..e695ac0f4d 100644 --- a/src/corelib/tools/qlocale_tools.cpp +++ b/src/corelib/tools/qlocale_tools.cpp @@ -2370,10 +2370,9 @@ static char *_qdtoa( NEEDS_VOLATILE double d, int mode, int ndigits, int *decpt, } b = d2b(d, &be, &bbits); -#ifdef Sudden_Underflow i = (int)(getWord0(d) >> Exp_shift1 & (Exp_mask>>Exp_shift1)); -#else - if ((i = int(getWord0(d) >> Exp_shift1 & (Exp_mask>>Exp_shift1))) != 0) { +#ifndef Sudden_Underflow + if (i != 0) { #endif d2 = d; setWord0(&d2, getWord0(d2) & Frac_mask1); |