diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-22 13:48:20 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-22 13:48:20 (GMT) |
| commit | 41456794ccd80bbd683ed19354f6e6d97c45681b (patch) | |
| tree | 149a738be5658b665cb50de45013b95dec74ad6f /src/corelib/tools/qlocale.cpp | |
| parent | e0bd60f6c8a489c5703b648fe2e2470763f67e37 (diff) | |
| parent | 7abb03d75155cef86df58f117031b092b637876f (diff) | |
| download | Qt-41456794ccd80bbd683ed19354f6e6d97c45681b.zip Qt-41456794ccd80bbd683ed19354f6e6d97c45681b.tar.gz Qt-41456794ccd80bbd683ed19354f6e6d97c45681b.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Round origin of text in OpenVG engine
QThread::exec(): Fix possibility to enter several time the event loop
QMessageBox: change the documentation to reflect that it is application modal
Compile on OpenBSD
Doc: Q_PROPERTY, implements the setter/getter in the example
Dynamically register the event number.
Fix wrong error assumption when converting "0.0" to double
Diffstat (limited to 'src/corelib/tools/qlocale.cpp')
| -rw-r--r-- | src/corelib/tools/qlocale.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp index d152682..83d6dcd 100644 --- a/src/corelib/tools/qlocale.cpp +++ b/src/corelib/tools/qlocale.cpp @@ -7308,6 +7308,7 @@ Q_CORE_EXPORT char *qdtoa( double d, int mode, int ndigits, int *decpt, int *sig Q_CORE_EXPORT double qstrtod(const char *s00, const char **se, bool *ok) { + errno = 0; double ret = strtod((char*)s00, (char**)se); if (ok) { if((ret == 0.0l && errno == ERANGE) |