diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-08-14 17:18:48 +0200 |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-08-14 17:18:48 +0200 |
| commit | 9db9c1f2215e32047c7329ab769d54dd3c1ddeb7 (patch) | |
| tree | 98acb9a60cf237138f939b5dadb0d9ae7722ddeb /src/gui/kernel/qwidget.cpp | |
| parent | e9d32707afeddfdd2906af7bed60c375b1035dd6 (diff) | |
| parent | 3c8f4512df30dee4a867a498fff6d2b27b881e4b (diff) | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/gui/kernel/qwidget.cpp')
| -rw-r--r-- | src/gui/kernel/qwidget.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index cc41f7365..c00f953d9 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -2747,7 +2747,7 @@ void QWidget::showNormal() bool QWidget::isEnabledTo(QWidget* ancestor) const { const QWidget * w = this; - while (w && !w->testAttribute(Qt::WA_ForceDisabled) + while (!w->testAttribute(Qt::WA_ForceDisabled) && !w->isWindow() && w->parentWidget() && w->parentWidget() != ancestor) @@ -7239,8 +7239,7 @@ bool QWidget::isVisibleTo(QWidget* ancestor) const if (!ancestor) return isVisible(); const QWidget * w = this; - while (w - && !w->isHidden() + while (!w->isHidden() && !w->isWindow() && w->parentWidget() && w->parentWidget() != ancestor) |