diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-07-19 03:27:10 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-07-19 03:27:10 (GMT) |
| commit | 4a117eb54821d4524439593fad53dde7596b6378 (patch) | |
| tree | 6751bf6f69173fc3da86407185e9b2f7042a025d /tests | |
| parent | 931222b7d665e101ada070afb51b82f9bb85db6d (diff) | |
| parent | 3c2116edf1a8a2770e5ca7dbf6ae342afe5ee18f (diff) | |
| download | Qt-4a117eb54821d4524439593fad53dde7596b6378.zip Qt-4a117eb54821d4524439593fad53dde7596b6378.tar.gz Qt-4a117eb54821d4524439593fad53dde7596b6378.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/compiler/tst_compiler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/compiler/tst_compiler.cpp b/tests/auto/compiler/tst_compiler.cpp index 368620d..90eb357 100644 --- a/tests/auto/compiler/tst_compiler.cpp +++ b/tests/auto/compiler/tst_compiler.cpp @@ -640,7 +640,7 @@ static inline double qt_inf() #endif union { uchar c[8]; double d; } returnValue; - qMemCopy(returnValue.c, bytes, sizeof(returnValue.c)); + memcpy(returnValue.c, bytes, sizeof(returnValue.c)); return returnValue.d; } |