diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-22 05:20:47 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-22 05:20:47 (GMT) |
| commit | 60c195a1865e06026b54a5d8fd0036aaa010b8bc (patch) | |
| tree | efc90717e8107f06d6eda5e3d864d64eb2e43c0e /src/corelib/global | |
| parent | 80c2e1211065f606c6f39e708a74afad1c624663 (diff) | |
| parent | 44ac0a7ff72c94e7b417da18766ad1578b97b4b0 (diff) | |
| download | Qt-60c195a1865e06026b54a5d8fd0036aaa010b8bc.zip Qt-60c195a1865e06026b54a5d8fd0036aaa010b8bc.tar.gz Qt-60c195a1865e06026b54a5d8fd0036aaa010b8bc.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
apply msvc flags to wince too
fix qt static build on wince
fix build with QT_NO_GESTURES
qmake: fix quoting of moc calls
Use regparm(3) for ICC too, otherwise it's an ABI mismatch in QChar
Regenerate the Unicode tables after updates to the generator tool
Compile in C++0x mode
remove extra includes
minor clean-ups
minor improvements for data parsers
tiny clean-up for generated data
move QUnicodeTables:: script() and lineBreakClass() implementations
make lupdate test less fragile
Enable building Qt/Webkit with debug symbols
Add breakpad support
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qglobal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index c906a1c..d04133b 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1050,7 +1050,7 @@ redefine to built-in booleans to make autotests work properly */ #if defined(__i386__) || defined(_WIN32) || defined(_WIN32_WCE) # if defined(Q_CC_GNU) -#if !defined(Q_CC_INTEL) && ((100*(__GNUC__ - 0) + 10*(__GNUC_MINOR__ - 0) + __GNUC_PATCHLEVEL__) >= 332) +#if ((100*(__GNUC__ - 0) + 10*(__GNUC_MINOR__ - 0) + __GNUC_PATCHLEVEL__) >= 332) # define QT_FASTCALL __attribute__((regparm(3))) #else # define QT_FASTCALL |