diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-13 09:37:47 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-13 09:37:47 (GMT) |
| commit | 734bb8d70d3a474f8d1d82ca97ac726a1a76206a (patch) | |
| tree | 339887db1cbe14430f19d1d60b6d2f375987d598 /src/tools/moc/generator.cpp | |
| parent | 7086e3657d6c9007ffdc6ab37eaa7b3a5502aaac (diff) | |
| parent | cb7c3b8f837d123cef1a180b700b53869cc77ea6 (diff) | |
| download | Qt-734bb8d70d3a474f8d1d82ca97ac726a1a76206a.zip Qt-734bb8d70d3a474f8d1d82ca97ac726a1a76206a.tar.gz Qt-734bb8d70d3a474f8d1d82ca97ac726a1a76206a.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Update QDesktopServices openUrl() documentation on Symbian OS
Mark binaries as SMPSAFE in Symbian
Add a cast to moc cpp generator to remove armcc warnings
Fix QColumnView auto test failure
Diffstat (limited to 'src/tools/moc/generator.cpp')
| -rw-r--r-- | src/tools/moc/generator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp index 72fda2d..b1bcab7 100644 --- a/src/tools/moc/generator.cpp +++ b/src/tools/moc/generator.cpp @@ -574,7 +574,7 @@ void Generator::generateProperties() strreg(p.name), strreg(p.type)); if (!(flags >> 24) && isQRealType(p.type)) - fprintf(out, "(QMetaType::QReal << 24) | "); + fprintf(out, "((uint)QMetaType::QReal << 24) | "); fprintf(out, "0x%.8x,\n", flags); } |