summaryrefslogtreecommitdiffstats
path: root/config.tests/unix
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2011-01-25 17:56:33 (GMT)
committerOlivier Goffart <olivier.goffart@nokia.com>2011-01-25 17:56:33 (GMT)
commit5422e929cad04633a06c156cba96cfcd69262522 (patch)
treeafb3c9b76c05d80238a1ff76f4e8f4019fac1651 /config.tests/unix
parentac798c5d77c59ea8dfe29c9d1896fb6604e3a628 (diff)
parenta0e0a9378d10db9c8ab3ba4d59f5c576ee4cbc40 (diff)
downloadQt-5422e929cad04633a06c156cba96cfcd69262522.zip
Qt-5422e929cad04633a06c156cba96cfcd69262522.tar.gz
Qt-5422e929cad04633a06c156cba96cfcd69262522.tar.bz2
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts: configure src/network/bearer/bearer.pri
Diffstat (limited to 'config.tests/unix')
-rw-r--r--config.tests/unix/doubleformat/doubleformattest.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/config.tests/unix/doubleformat/doubleformattest.cpp b/config.tests/unix/doubleformat/doubleformattest.cpp
index f7b9000..b906e00 100644
--- a/config.tests/unix/doubleformat/doubleformattest.cpp
+++ b/config.tests/unix/doubleformat/doubleformattest.cpp
@@ -54,7 +54,7 @@ tested on x86, arm-le (gp), aix
#include <stdlib.h>
// equals static char c [] = "0123ABCD0123ABCD\0\0\0\0\0\0\0"
-static double d [] = { 710524581542275055616.0, 710524581542275055616.0};
+static double d [] = { 710524581542275055616.0, 710524581542275055616.0, 0.0 };
int main(int argc, char **argv)
{