diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-04-27 09:27:52 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-04-27 09:27:52 (GMT) |
| commit | 896db169ea224deb96c59ce8af800d019de63f12 (patch) | |
| tree | 8350c36941ccfd74df35fb8a6a761edcbf042452 /src/svg | |
| parent | 7a73de74fc517ff5722289cce4e4e754ff2417be (diff) | |
| parent | f8fea6f3b8fd3a1baa256130b23efc9e67a40e21 (diff) | |
| download | Qt-896db169ea224deb96c59ce8af800d019de63f12.zip Qt-896db169ea224deb96c59ce8af800d019de63f12.tar.gz Qt-896db169ea224deb96c59ce8af800d019de63f12.tar.bz2 | |
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Conflicts:
src/opengl/qwindowsurface_gl.cpp
src/s60installs/eabi/QtGuiu.def
Diffstat (limited to 'src/svg')
| -rw-r--r-- | src/svg/qsvghandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp index 9698860..3fbc08c 100644 --- a/src/svg/qsvghandler.cpp +++ b/src/svg/qsvghandler.cpp @@ -584,7 +584,7 @@ static qreal toDouble(const QChar *&str) ++str; } bool exponent = false; - if (*str == QLatin1Char('e') && pos < maxLen) { + if ((*str == QLatin1Char('e') || *str == QLatin1Char('E')) && pos < maxLen) { exponent = true; temp[pos++] = 'e'; ++str; |