diff options
| author | Jiang Jiang <jiang.jiang@nokia.com> | 2010-11-22 16:05:42 (GMT) |
|---|---|---|
| committer | Jiang Jiang <jiang.jiang@nokia.com> | 2010-11-23 12:26:59 (GMT) |
| commit | 9746f31088961645e59c0d4a8d995601153a9ee7 (patch) | |
| tree | 3cbd16bff489d868d9f5e49c713c5ff59dddfa76 /src/gui/kernel/qwidget_mac.mm | |
| parent | 774a8ff7444001917287524ac57d370c6995dea0 (diff) | |
| download | Qt-9746f31088961645e59c0d4a8d995601153a9ee7.zip Qt-9746f31088961645e59c0d4a8d995601153a9ee7.tar.gz Qt-9746f31088961645e59c0d4a8d995601153a9ee7.tar.bz2 | |
Fix a namespace error and some warnings found by clang
Reviewed-by: Fabien Freling
Diffstat (limited to 'src/gui/kernel/qwidget_mac.mm')
| -rw-r--r-- | src/gui/kernel/qwidget_mac.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm index fc94616..882f03b 100644 --- a/src/gui/kernel/qwidget_mac.mm +++ b/src/gui/kernel/qwidget_mac.mm @@ -2931,7 +2931,7 @@ void QWidgetPrivate::setParent_sys(QWidget *parent, Qt::WindowFlags f) // unless this is an alien widget. ) const bool nonWindowWithCreatedParent = !q->isWindow() && parent->testAttribute(Qt::WA_WState_Created); const bool nativeWidget = q->internalWinId() != 0; - if (wasCreated || nativeWidget && nonWindowWithCreatedParent) { + if (wasCreated || (nativeWidget && nonWindowWithCreatedParent)) { createWinId(); if (q->isWindow()) { #ifndef QT_MAC_USE_COCOA |