diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp index e0e368f..e452c4d 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem.cpp +++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp @@ -3633,11 +3633,14 @@ void QDeclarativeItem::setSize(const QSizeF &size) /*! \internal */ bool QDeclarativeItem::hasActiveFocus() const { + Q_D(const QDeclarativeItem); QGraphicsItem *fi = focusItem(); + qDebug() << Q_FUNC_INFO << fi; QGraphicsScene *s = scene(); bool hasOrWillGainFocus = fi && fi->isVisible() && (!s || s->focusItem() == fi); bool isOrIsScopeOfFocusItem = (fi == this || (d->flags & QGraphicsItem::ItemIsFocusScope)); + qDebug() << Q_FUNC_INFO << hasOrWillGainFocus << isOrIsScopeOfFocusItem; return hasOrWillGainFocus && isOrIsScopeOfFocusItem; } diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp index bbb1fca..73ad7df 100644 --- a/src/gui/kernel/qapplication_win.cpp +++ b/src/gui/kernel/qapplication_win.cpp @@ -1454,6 +1454,17 @@ void QApplication::winFocus(QWidget *widget, bool gotFocus) // QtWndProc() receives all messages from the main event loop // +QDebug operator<<(QDebug d, const MINMAXINFO &i) +{ + d.nospace() << "MINMAXINFO maxSize=" << i.ptMaxSize.x << ',' + << i.ptMaxSize.y << " maxpos=" << i.ptMaxPosition.x + << ',' << i.ptMaxPosition.y << " mintrack=" + << i.ptMinTrackSize.x << ',' << i.ptMinTrackSize.y + << " maxtrack=" << i.ptMaxTrackSize.x << ',' + << i.ptMaxTrackSize.y; + return d; +} + static bool inLoop = false; static int inputcharset = CP_ACP; @@ -2284,6 +2295,7 @@ extern "C" LRESULT QT_WIN_CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wPa } if ( maxh < QWIDGETSIZE_MAX ) mmi->ptMaxTrackSize.y = maxh + fs.top() + fs.bottom(); + qDebug() << *mmi; RETURN(0); } break; diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index 53c1d3f..43f418c 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -5104,6 +5104,7 @@ QCursor QWidget::cursor() const void QWidget::setCursor(const QCursor &cursor) { + return; Q_D(QWidget); // On Mac we must set the cursor even if it is the ArrowCursor. #if !defined(Q_WS_MAC) && !defined(Q_WS_QWS) diff --git a/src/gui/kernel/qwidget_win.cpp b/src/gui/kernel/qwidget_win.cpp index 1e8b030..f088d63 100644 --- a/src/gui/kernel/qwidget_win.cpp +++ b/src/gui/kernel/qwidget_win.cpp @@ -353,7 +353,7 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO } } } - + qDebug() << __FUNCTION__ << q <isWindow() ? qAppName() : q->objectName(); }