diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-11-13 16:03:27 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-11-13 16:03:27 (GMT) |
| commit | 149b13bdec3802a80e86a0de77837d7e9cbab8af (patch) | |
| tree | 41a76edb43874b11d36f53c745a3e40393feb52f /src/corelib/global | |
| parent | cf44101e03eb33caa7c37fbd8023c2948b7f0249 (diff) | |
| parent | 0c52573b646d8f139f37c26c954d03061ddb485a (diff) | |
| download | Qt-149b13bdec3802a80e86a0de77837d7e9cbab8af.zip Qt-149b13bdec3802a80e86a0de77837d7e9cbab8af.tar.gz Qt-149b13bdec3802a80e86a0de77837d7e9cbab8af.tar.bz2 | |
Merge branch '4.6'
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qglobal.h | 7 | ||||
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index b58c9dd..e2c524d 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -437,13 +437,18 @@ namespace QT_NAMESPACE {} #elif defined(__GCCE__) # define Q_CC_GCCE # define QT_VISIBILITY_AVAILABLE +# if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) +# define QT_HAVE_ARMV6 +# endif /* ARM Realview Compiler Suite RVCT compiler also defines __EDG__ and __GNUC__ (if --gnu flag is given), so check for it before that */ #elif defined(__ARMCC__) || defined(__CC_ARM) # define Q_CC_RVCT - +# if __TARGET_ARCH_ARM >= 6 +# define QT_HAVE_ARMV6 +# endif #elif defined(__GNUC__) # define Q_CC_GNU # define Q_C_CALLBACKS diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 5ac3675..ae47f13 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -2003,7 +2003,7 @@ \value Tool Indicates that the widget is a tool window. A tool window is often a small window with a smaller than usual title bar and decoration, typically used for - collections of tool buttons. It there is a parent, + collections of tool buttons. If there is a parent, the tool window will always be kept on top of it. If there isn't a parent, you may consider using Qt::WindowStaysOnTopHint as well. If the window |