diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-07-20 03:16:41 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-07-20 03:16:41 (GMT) |
| commit | bd25c0401644e1a1f443532c3e2a75201422b255 (patch) | |
| tree | f938b233427aebf4577c3e0c767f349bdfff9c0f | |
| parent | ecc71bebda5cdc842932f29757d869c8a1288962 (diff) | |
| parent | 5f03a1502bee93523033e8769b8fc235d36d58db (diff) | |
| download | Qt-bd25c0401644e1a1f443532c3e2a75201422b255.zip Qt-bd25c0401644e1a1f443532c3e2a75201422b255.tar.gz Qt-bd25c0401644e1a1f443532c3e2a75201422b255.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| -rw-r--r-- | src/corelib/kernel/qmetaobjectbuilder.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/kernel/qmetaobjectbuilder.cpp b/src/corelib/kernel/qmetaobjectbuilder.cpp index d655e3f..dd831a8 100644 --- a/src/corelib/kernel/qmetaobjectbuilder.cpp +++ b/src/corelib/kernel/qmetaobjectbuilder.cpp @@ -40,7 +40,9 @@ ****************************************************************************/ #include "qmetaobjectbuilder_p.h" +#ifndef Q_OS_WIN #include <stdint.h> +#endif QT_BEGIN_NAMESPACE |