diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-20 00:58:20 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-20 00:58:20 +1000 |
| commit | f60b3e90e6fd28a543300365b7ad349215a6f849 (patch) | |
| tree | 684cae002507ba6fe58cba058c2da7b888cd2511 /tests | |
| parent | 348f5f40d897f2d2e36af2e657467509394e515d (diff) | |
| parent | 611837baec6a32f8c4d88c34f5b96cce15bf3120 (diff) | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Don't crash if windowmanager is not initialized
Compile fix for 64bit Linux.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/benchmarks/corelib/tools/qstring/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/benchmarks/corelib/tools/qstring/main.cpp b/tests/benchmarks/corelib/tools/qstring/main.cpp index 96f2c30cf4..9d9de81d17 100644 --- a/tests/benchmarks/corelib/tools/qstring/main.cpp +++ b/tests/benchmarks/corelib/tools/qstring/main.cpp @@ -921,7 +921,7 @@ static inline int ucstrncmp_short_tail(const ushort *p1, const ushort *p2, int l return 0; } -static inline int bsf_nonzero(register long val) +static inline int bsf_nonzero(register int val) { int result; # ifdef Q_CC_GNU |