Changeset 561 for trunk/src/gui/widgets

trunk

Property svn:mergeinfo set to (toggle deleted branches)
/branches/vendor/nokia/qt/4.6.1 merged eligible
/branches/vendor/nokia/qt/current merged eligible
/branches/vendor/trolltech/qt/current 3-149

trunk/src/gui/widgets/qabstractbutton.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #endif
     checkable(false), checked(false), autoRepeat(false), autoExclusive(false),
     down(false), blockRefresh(false),
+    down(false), blockRefresh(false), pressed(false),
 #ifndef QT_NO_BUTTONGROUP
     group(0),
 …
+}
+/*!
+    Adds the given \a button to the end of the group's internal list of buttons.
+    \sa removeButton()
+*/
+// TODO: Qt 5: Merge with addButton(QAbstractButton *button, int id)
 void QButtonGroup::addButton(QAbstractButton *button)
+{
 …
     button->d_func()->group = this;
     d->buttonList.append(button);
+    if (id != -1)
+    if (id == -1) {
+        QList<int> ids = d->mapping.values();
+        if (ids.isEmpty())
+           d->mapping[button] = -2;
+        else {
+            qSort(ids);
+            d->mapping[button] = ids.first()-1;
+        }
+    } else {
         d->mapping[button] = id;
+    }
     if (d->exclusive && button->isChecked())
         button->d_func()->notifyChecked();
 …
 #endif
+    Q_Q(const QAbstractButton);
+    QList<QAbstractButton*>candidates;
+    if (q->parentWidget()) {
+        candidates =  qFindChildren<QAbstractButton *>(q->parentWidget());
+        if (autoExclusive) {
+            for (int i = candidates.count() - 1; i >= 0; --i) {
+                QAbstractButton *candidate = candidates.at(i);
+                if (!candidate->autoExclusive()
+#ifndef QT_NO_BUTTONGROUP
+                    || candidate->group()
+#endif
+                    )
+                    candidates.removeAt(i);
+            }
+    QList<QAbstractButton*>candidates = qFindChildren<QAbstractButton *>(parent);
+    if (autoExclusive) {
+        for (int i = candidates.count() - 1; i >= 0; --i) {
+            QAbstractButton *candidate = candidates.at(i);
+            if (!candidate->autoExclusive()
+#ifndef QT_NO_BUTTONGROUP
+                || candidate->group()
+#endif
+                )
+                candidates.removeAt(i);
+        }
+    }
 …
     bool exclusive = autoExclusive;
 #endif
     QWidget *f = qApp->focusWidget();
+    QWidget *f = QApplication::focusWidget();
     QAbstractButton *fb = qobject_cast<QAbstractButton *>(f);
     if (!fb || !buttonList.contains(fb))
 …
     if (hitButton(e->pos())) {
         setDown(true);
+        d->pressed = true;
         repaint(); //flush paint event before invoking potentially expensive operation
         QApplication::flush();
 …
+{
     Q_D(QAbstractButton);
+    d->pressed = false;
     if (e->button() != Qt::LeftButton) {
         e->ignore();
 …
+{
     Q_D(QAbstractButton);
     if (!(e->buttons() & Qt::LeftButton)) {
+    if (!(e->buttons() & Qt::LeftButton) || !d->pressed) {
         e->ignore();
         return;
 …
     case Qt::Key_Down:
 #ifdef QT_KEYPAD_NAVIGATION
+        if (QApplication::keypadNavigationEnabled() && (e->key() == Qt::Key_Left || e->key() == Qt::Key_Right)) {
+        if ((QApplication::keypadNavigationEnabled()
+                && (e->key() == Qt::Key_Left || e->key() == Qt::Key_Right))
+                || (!QApplication::navigationMode() == Qt::NavigationModeKeypadDirectional
+                || (e->key() == Qt::Key_Up || e->key() == Qt::Key_Down))) {
             e->ignore();
             return;
 …
         if (d->down) {
             QPointer<QAbstractButton> guard(this);
+            d->emitReleased();
+            nextCheckState();
+            if (guard)
+                d->emitReleased();
             if (guard)
                 d->emitClicked();

trunk/src/gui/widgets/qabstractbutton.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/qabstractbutton_p.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     uint down :1;
     uint blockRefresh :1;
+    uint pressed : 1;
 #ifndef QT_NO_BUTTONGROUP

trunk/src/gui/widgets/qabstractscrollarea.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #include "qboxlayout.h"
 #include "qpainter.h"
+#include "qmargins.h"
 #include "qabstractscrollarea_p.h"
 #include <qwidget.h>
+#include <private/qapplication_p.h>
 #ifdef Q_WS_MAC
 …
      viewport(0), cornerWidget(0), left(0), top(0), right(0), bottom(0),
      xoffset(0), yoffset(0), viewportFilter(0)
+#ifdef Q_WS_WIN
+     , singleFingerPanEnabled(false)
+#endif
+{
+}
 …
     QObject::connect(vbar, SIGNAL(valueChanged(int)), q, SLOT(_q_vslide(int)));
     QObject::connect(vbar, SIGNAL(rangeChanged(int,int)), q, SLOT(_q_showOrHideScrollBars()), Qt::QueuedConnection);
     viewportFilter = new QAbstractScrollAreaFilter(this);
     viewport->installEventFilter(viewportFilter);
+    viewportFilter.reset(new QAbstractScrollAreaFilter(this));
+    viewport->installEventFilter(viewportFilter.data());
     viewport->setFocusProxy(q);
     q->setFocusPolicy(Qt::WheelFocus);
 …
     q->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
     layoutChildren();
+}
+#ifndef Q_WS_MAC
+    viewport->grabGesture(Qt::PanGesture);
+#endif
+}
+#ifdef Q_WS_WIN
+void QAbstractScrollAreaPrivate::setSingleFingerPanEnabled(bool on)
+{
+    singleFingerPanEnabled = on;
+    QWidgetPrivate *dd = static_cast<QWidgetPrivate *>(QObjectPrivate::get(viewport));
+    if (dd)
+        dd->winSetupGestures();
+}
+#endif // Q_WS_WIN
 void QAbstractScrollAreaPrivate::layoutChildren()
 …
+}
-// ### Fix for 4.4, talk to Bjoern E or Girish.
-void QAbstractScrollAreaPrivate::scrollBarPolicyChanged(Qt::Orientation, Qt::ScrollBarPolicy) {}
 /*!
     \internal
 …
+{
     Q_D(QAbstractScrollArea);
+    d->init();
+    QT_TRY {
+        d->init();
+    } QT_CATCH(...) {
+        d->viewportFilter.reset();
+        QT_RETHROW;
+    }
+}
 …
+{
     Q_D(QAbstractScrollArea);
+    d->init();
+    QT_TRY {
+        d->init();
+    } QT_CATCH(...) {
+        d->viewportFilter.reset();
+        QT_RETHROW;
+    }
+}
 …
+{
     Q_D(QAbstractScrollArea);
+    delete d->viewportFilter;
+    // reset it here, otherwise we'll have a dangling pointer in ~QWidget
+    d->viewportFilter.reset();
+}
 …
         d->viewport->setParent(this);
         d->viewport->setFocusProxy(this);
+        d->viewport->installEventFilter(d->viewportFilter);
+        d->viewport->installEventFilter(d->viewportFilter.data());
+#ifndef Q_WS_MAC
+        d->viewport->grabGesture(Qt::PanGesture);
+#endif
         d->layoutChildren();
         if (isVisible())
 …
     d->bottom = bottom;
     d->layoutChildren();
+}
+/*!
+    \since 4.6
+    Sets \a margins around the scrolling area. This is useful for
+    applications such as spreadsheets with "locked" rows and columns.
+    The marginal space is is left blank; put widgets in the unused
+    area.
+    By default all margins are zero.
+*/
+void QAbstractScrollArea::setViewportMargins(const QMargins &margins)
+{
+    setViewportMargins(margins.left(), margins.top(),
+                       margins.right(), margins.bottom());
+}
 …
             d->layoutChildren();
             break;
+    case QEvent::Paint:
+    case QEvent::Paint: {
+        QStyleOption option;
+        option.initFrom(this);
         if (d->cornerPaintingRect.isValid()) {
-            QStyleOption option;
             option.rect = d->cornerPaintingRect;
             QPainter p(this);
 …
 #ifdef Q_WS_MAC
         if (d->reverseCornerPaintingRect.isValid()) {
-            QStyleOption option;
             option.rect = d->reverseCornerPaintingRect;
             QPainter p(this);
 …
+        }
 #endif
+        }
         QFrame::paintEvent((QPaintEvent*)e);
         break;
 …
     case QEvent::DragLeave:
 #endif
+        // ignore touch events in case they have been propagated from the viewport
+    case QEvent::TouchBegin:
+    case QEvent::TouchUpdate:
+    case QEvent::TouchEnd:
         return false;
+    case QEvent::Gesture:
+    {
+        QGestureEvent *ge = static_cast<QGestureEvent *>(e);
+        QPanGesture *g = static_cast<QPanGesture *>(ge->gesture(Qt::PanGesture));
+        if (g) {
+            QScrollBar *hBar = horizontalScrollBar();
+            QScrollBar *vBar = verticalScrollBar();
+            QPointF delta = g->delta();
+            if (!delta.isNull()) {
+                if (QApplication::isRightToLeft())
+                    delta.rx() *= -1;
+                int newX = hBar->value() - delta.x();
+                int newY = vBar->value() - delta.y();
+                hBar->setValue(newX);
+                vBar->setValue(newY);
+            }
+            return true;
+        }
+        return false;
+    }
     case QEvent::StyleChange:
     case QEvent::LayoutDirectionChange:
 …
     case QEvent::MouseButtonRelease:
     case QEvent::MouseButtonDblClick:
+    case QEvent::TouchBegin:
+    case QEvent::TouchUpdate:
+    case QEvent::TouchEnd:
     case QEvent::MouseMove:
     case QEvent::ContextMenu:
 …
         return QFrame::event(e);
     case QEvent::LayoutRequest:
+    case QEvent::Gesture:
+    case QEvent::GestureOverride:
         return event(e);
     default:
 …
+{
     Q_D(QAbstractScrollArea);
+    if (static_cast<QWheelEvent*>(e)->orientation() == Qt::Horizontal)
+        QApplication::sendEvent(d->hbar, e);
+    else
+        QApplication::sendEvent(d->vbar, e);
+    QScrollBar *const bars[2] = { d->hbar, d->vbar };
+    int idx = (e->orientation() == Qt::Vertical) ? 1 : 0;
+    int other = (idx + 1) % 2;
+    if (!bars[idx]->isVisible() && bars[other]->isVisible())
+        idx = other;   // If the scrollbar of the event orientation is hidden, fallback to the other.
+    QApplication::sendEvent(bars[idx], e);
+}
 #endif
 …
+{
     layoutChildren();
+#ifdef Q_WS_WIN
+    // Need to re-subscribe to gestures as the content changes to make sure we
+    // enable/disable panning when needed.
+    QWidgetPrivate *dd = static_cast<QWidgetPrivate *>(QObjectPrivate::get(viewport));
+    if (dd)
+        dd->winSetupGestures();
+#endif // Q_WS_WIN
+}
 …
     int vsbExt = d->vbar->sizeHint().width();
     int extra = 2 * d->frameWidth;
+    QStyleOption opt;
+    opt.initFrom(this);
+    if ((d->frameStyle != QFrame::NoFrame)
+        && style()->styleHint(QStyle::SH_ScrollView_FrameOnlyAroundContents, &opt, this)) {
+        extra += style()->pixelMetric(QStyle::PM_ScrollView_ScrollBarSpacing, &opt, this);
+    }
     return QSize(d->scrollBarContainers[Qt::Horizontal]->sizeHint().width() + vsbExt + extra,
                  d->scrollBarContainers[Qt::Vertical]->sizeHint().height() + hsbExt + extra);

trunk/src/gui/widgets/qabstractscrollarea.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #ifndef QT_NO_SCROLLAREA
+class QMargins;
 class QScrollBar;
 class QAbstractScrollAreaPrivate;
 …
     QAbstractScrollArea(QAbstractScrollAreaPrivate &dd, QWidget *parent = 0);
     void setViewportMargins(int left, int top, int right, int bottom);
+    void setViewportMargins(const QMargins &margins);
     bool event(QEvent *);
 …
     friend class QStyleSheetStyle;
+    friend class QWidgetPrivate;
 };

trunk/src/gui/widgets/qabstractscrollarea_p.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 class QScrollBar;
 class QAbstractScrollAreaScrollBarContainer;
 class Q_GUI_EXPORT QAbstractScrollAreaPrivate: public QFramePrivate
+class Q_AUTOTEST_EXPORT QAbstractScrollAreaPrivate: public QFramePrivate
+{
     Q_DECLARE_PUBLIC(QAbstractScrollArea)
 …
     void layoutChildren();
     // ### Fix for 4.4, talk to Bjoern E or Girish.
     virtual void scrollBarPolicyChanged(Qt::Orientation, Qt::ScrollBarPolicy);
+    virtual void scrollBarPolicyChanged(Qt::Orientation, Qt::ScrollBarPolicy) {}
     void _q_hslide(int);
 …
     inline bool viewportEvent(QEvent *event)
     { return q_func()->viewportEvent(event); }
+    QObject *viewportFilter;
+    QScopedPointer<QObject> viewportFilter;
+#ifdef Q_WS_WIN
+    bool singleFingerPanEnabled;
+    void setSingleFingerPanEnabled(bool on = true);
+#endif
 };

trunk/src/gui/widgets/qabstractslider.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #include "qaccessible.h"
 #endif
+#ifdef QT_KEYPAD_NAVIGATION
+#include "qtabwidget.h" // Needed in inTabWidget()
+#endif // QT_KEYPAD_NAVIGATION
 #include <limits.h>
 …
 QAbstractSliderPrivate::QAbstractSliderPrivate()
     : minimum(0), maximum(99), singleStep(1), pageStep(10),
+      value(0), position(0), pressValue(-1), tracking(true), blocktracking(false), pressed(false),
+      value(0), position(0), pressValue(-1), offset_accumulated(0), tracking(true),
+      blocktracking(false), pressed(false),
       invertedAppearance(false), invertedControls(false),
       orientation(Qt::Horizontal), repeatAction(QAbstractSlider::SliderNoAction)
+#ifdef QT_KEYPAD_NAVIGATION
+      , isAutoRepeating(false)
+      , repeatMultiplier(1)
+#endif
+{
+}
 …
     abstract sliders provides and typically corresponds to the user
     pressing an arrow key.
+    If the property is modified during an auto repeating key event, behavior
+    is undefined.
     \sa pageStep
 …
     switch (action) {
     case SliderSingleStepAdd:
         setSliderPosition(d->overflowSafeAdd(d->singleStep));
+        setSliderPosition(d->overflowSafeAdd(d->effectiveSingleStep()));
         break;
     case SliderSingleStepSub:
         setSliderPosition(d->overflowSafeAdd(-d->singleStep));
+        setSliderPosition(d->overflowSafeAdd(-d->effectiveSingleStep()));
         break;
     case SliderPageStepAdd:
 …
     Q_D(QAbstractSlider);
     e->ignore();
+    if (e->orientation() != d->orientation && !rect().contains(e->pos()))
+        return;
+    static qreal offset = 0;
+    static QAbstractSlider *offset_owner = 0;
+    if (offset_owner != this){
+        offset_owner = this;
+        offset = 0;
+    }
+    // On Mac/Cocoa, always scroll one step. The mouse wheel acceleration
+    // is higher than on other systems, so this works well in practice.
+#ifdef QT_MAC_USE_COCOA
+    int step = 1;
+#else
+    int step = qMin(QApplication::wheelScrollLines() * d->singleStep, d->pageStep);
+    int stepsToScroll = 0;
+    qreal offset = qreal(e->delta()) / 120;
+    if ((e->modifiers() & Qt::ControlModifier) || (e->modifiers() & Qt::ShiftModifier)) {
+        // Scroll one page regardless of delta:
+        stepsToScroll = qBound(-d->pageStep, int(offset * d->pageStep), d->pageStep);
+        d->offset_accumulated = 0;
+    } else {
+        // Calculate how many lines to scroll. Depending on what delta is (and
+        // offset), we might end up with a fraction (e.g. scroll 1.3 lines). We can
+        // only scroll whole lines, so we keep the reminder until next event.
+        qreal stepsToScrollF = offset * QApplication::wheelScrollLines() * d->effectiveSingleStep();
+        // Check if wheel changed direction since last event:
+        if (d->offset_accumulated != 0 && (offset / d->offset_accumulated) < 0)
+            d->offset_accumulated = 0;
+        d->offset_accumulated += stepsToScrollF;
+        stepsToScroll = qBound(-d->pageStep, int(d->offset_accumulated), d->pageStep);
+        d->offset_accumulated -= int(d->offset_accumulated);
+        if (stepsToScroll == 0)
+            return;
+    }
+    if (d->invertedControls)
+        stepsToScroll = -stepsToScroll;
+    int prevValue = d->value;
+    d->position = d->overflowSafeAdd(stepsToScroll); // value will be updated by triggerAction()
+    triggerAction(SliderMove);
+    if (prevValue == d->value)
+        d->offset_accumulated = 0;
+    else
+        e->accept();
+}
 #endif
+    if ((e->modifiers() & Qt::ControlModifier) || (e->modifiers() & Qt::ShiftModifier))
+        step = d->pageStep;
+    int currentOffset = qRound(qreal(e->delta()) * step / 120);
+    if (currentOffset == 0)
+        currentOffset = (e->delta() < 0 ? -1 : 1);
+    offset += currentOffset;
+    if (d->invertedControls)
+        offset = -offset;
+    int prevValue = d->value;
+    d->position = d->overflowSafeAdd(int(offset)); // value will be updated by triggerAction()
+    triggerAction(SliderMove);
+    if (prevValue == d->value) {
+        offset = 0;
+    } else {
+        offset -= int(offset);
+        e->accept();
+    }
+}
+#ifdef QT_KEYPAD_NAVIGATION
+/*!
+    \internal
+    Tells us if it there is currently a reachable widget by keypad navigation in
+    a certain \a orientation.
+    If no navigation is possible, occuring key events in that \a orientation may
+    be used to interact with the value in the focussed widget, even though it
+    currently has not the editFocus.
+    \sa QWidgetPrivate::widgetInNavigationDirection(), QWidget::hasEditFocus()
+*/
+inline static bool canKeypadNavigate(Qt::Orientation orientation)
+{
+    return orientation == Qt::Horizontal?
+            (QWidgetPrivate::widgetInNavigationDirection(QWidgetPrivate::DirectionEast)
+                    || QWidgetPrivate::widgetInNavigationDirection(QWidgetPrivate::DirectionWest))
+            :(QWidgetPrivate::widgetInNavigationDirection(QWidgetPrivate::DirectionNorth)
+                    || QWidgetPrivate::widgetInNavigationDirection(QWidgetPrivate::DirectionSouth));
+}
+/*!
+    \internal
+    Checks, if the \a widget is inside a QTabWidget. If is is inside
+    one, left/right key events will be used to switch between tabs in keypad
+    navigation. If there is no QTabWidget, the horizontal key events can be used to
+    interact with the value in the focussed widget, even though it currently has
+    not the editFocus.
+    \sa QWidget::hasEditFocus()
+*/
+inline static bool inTabWidget(QWidget *widget)
+{
+    for (QWidget *tabWidget = widget; tabWidget; tabWidget = tabWidget->parentWidget())
+        if (qobject_cast<const QTabWidget*>(tabWidget))
+            return true;
+    return false;
+}
+#endif // QT_KEYPAD_NAVIGATION
+/*!
+    \reimp
+*/
+void QAbstractSlider::keyPressEvent(QKeyEvent *ev)
+{
+    Q_D(QAbstractSlider);
+    SliderAction action = SliderNoAction;
+#ifdef QT_KEYPAD_NAVIGATION
+    if (ev->isAutoRepeat()) {
+        if (d->firstRepeat.isNull())
+            d->firstRepeat = QTime::currentTime();
+        else if (1 == d->repeatMultiplier) {
+            // This is the interval in milli seconds which one key repetition
+            // takes.
+            const int repeatMSecs = d->firstRepeat.msecsTo(QTime::currentTime());
+            /**
+             * The time it takes to currently navigate the whole slider.
+             */
+            const qreal currentTimeElapse = (qreal(maximum()) / singleStep()) * repeatMSecs;
+            /**
+             * This is an arbitrarily determined constant in msecs that
+             * specifies how long time it should take to navigate from the
+             * start to the end(excluding starting key auto repeat).
+             */
+            const int SliderRepeatElapse = 2500;
+            d->repeatMultiplier = currentTimeElapse / SliderRepeatElapse;
+        }
+    }
+    else if (!d->firstRepeat.isNull()) {
+        d->firstRepeat = QTime();
+        d->repeatMultiplier = 1;
+    }
 #endif
+/*!
+    \reimp
+*/
+void QAbstractSlider::keyPressEvent(QKeyEvent *ev)
+{
+    Q_D(QAbstractSlider);
+    SliderAction action = SliderNoAction;
     switch (ev->key()) {
 #ifdef QT_KEYPAD_NAVIGATION
 …
         case Qt::Key_Left:
 #ifdef QT_KEYPAD_NAVIGATION
+            if (QApplication::keypadNavigationEnabled() && !hasEditFocus()) {
+            // In QApplication::KeypadNavigationDirectional, we want to change the slider
+            // value if there is no left/right navigation possible and if this slider is not
+            // inside a tab widget.
+            if (QApplication::keypadNavigationEnabled()
+                    && (!hasEditFocus() && QApplication::navigationMode() == Qt::NavigationModeKeypadTabOrder
+                    || d->orientation == Qt::Vertical
+                    || !hasEditFocus() && (canKeypadNavigate(Qt::Horizontal) || inTabWidget(this)))) {
                 ev->ignore();
                 return;
 …
         case Qt::Key_Right:
 #ifdef QT_KEYPAD_NAVIGATION
+            if (QApplication::keypadNavigationEnabled() && !hasEditFocus()) {
+            // Same logic as in Qt::Key_Left
+            if (QApplication::keypadNavigationEnabled()
+                    && (!hasEditFocus() && QApplication::navigationMode() == Qt::NavigationModeKeypadTabOrder
+                    || d->orientation == Qt::Vertical
+                    || !hasEditFocus() && (canKeypadNavigate(Qt::Horizontal) || inTabWidget(this)))) {
                 ev->ignore();
                 return;
 …
         case Qt::Key_Up:
 #ifdef QT_KEYPAD_NAVIGATION
+            if (QApplication::keypadNavigationEnabled()) {
+            // In QApplication::KeypadNavigationDirectional, we want to change the slider
+            // value if there is no up/down navigation possible.
+            if (QApplication::keypadNavigationEnabled()
+                    && (QApplication::navigationMode() == Qt::NavigationModeKeypadTabOrder
+                    || d->orientation == Qt::Horizontal
+                    || !hasEditFocus() && canKeypadNavigate(Qt::Vertical))) {
                 ev->ignore();
                 break;
 …
         case Qt::Key_Down:
 #ifdef QT_KEYPAD_NAVIGATION
+            if (QApplication::keypadNavigationEnabled()) {
+            // Same logic as in Qt::Key_Up
+            if (QApplication::keypadNavigationEnabled()
+                    && (QApplication::navigationMode() == Qt::NavigationModeKeypadTabOrder
+                    || d->orientation == Qt::Horizontal
+                    || !hasEditFocus() && canKeypadNavigate(Qt::Vertical))) {
                 ev->ignore();
                 break;

trunk/src/gui/widgets/qabstractslider.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/qabstractslider_p.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     void setSteps(int single, int page);
+    int minimum, maximum, singleStep, pageStep, value, position, pressValue;
+    int minimum, maximum, pageStep, value, position, pressValue;
+    /**
+     * Call effectiveSingleStep() when changing the slider value.
+     */
+    int singleStep;
+    float offset_accumulated;
     uint tracking : 1;
     uint blocktracking :1;
 …
 #ifdef QT_KEYPAD_NAVIGATION
     int origValue;
+    /**
+     */
+    bool isAutoRepeating;
+    /**
+     * When we're auto repeating, we multiply singleStep with this value to
+     * get our effective step.
+     */
+    qreal repeatMultiplier;
+    /**
+     * The time of when the first auto repeating key press event occurs.
+     */
+    QTime firstRepeat;
 #endif
+    inline int effectiveSingleStep() const
+    {
+        return singleStep
+#ifdef QT_KEYPAD_NAVIGATION
+        * repeatMultiplier
+#endif
+        ;
+    }
     inline int bound(int val) const { return qMax(minimum, qMin(maximum, val)); }

trunk/src/gui/widgets/qabstractspinbox.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #include <qstylepainter.h>
 #include <qdebug.h>
+#ifndef QT_NO_ACCESSIBILITY
+# include <qaccessible.h>
+#endif
 #if defined(Q_WS_X11)
 #include <limits.h>
+#endif
+#if defined(Q_OS_SYMBIAN)
+#include <W32STD.H>
+#include <private/qt_s60_p.h>
 #endif
 …
     if (d->buttonSymbols != buttonSymbols) {
         d->buttonSymbols = buttonSymbols;
+        d->updateEditFieldGeometry();
         update();
+    }
 …
     d->edit->setFrame(false);
-    d->edit->setAttribute(Qt::WA_InputMethodEnabled, false);
     d->edit->setFocusProxy(this);
     d->edit->setAcceptDrops(false);
 …
     Q_D(QAbstractSpinBox);
     d->interpret(EmitIfChanged);
+}
+/*
+    Reimplemented in 4.6, so be careful.
+ */
+/*!
+    \reimp
+*/
+QVariant QAbstractSpinBox::inputMethodQuery(Qt::InputMethodQuery query) const
+{
+    Q_D(const QAbstractSpinBox);
+    return d->edit->inputMethodQuery(query);
+}
 …
     int steps = 1;
+    bool isPgUpOrDown = false;
     switch (event->key()) {
     case Qt::Key_PageUp:
     case Qt::Key_PageDown:
         steps *= 10;
+        isPgUpOrDown = true;
     case Qt::Key_Up:
     case Qt::Key_Down: {
 …
             d->buttonState = (Keyboard | (up ? Up : Down));
+        }
+        stepBy(steps);
+        if (d->spinClickTimerId == -1)
+            stepBy(steps);
+        if(event->isAutoRepeat() && !isPgUpOrDown) {
+            if(d->spinClickThresholdTimerId == -1 && d->spinClickTimerId == -1) {
+                d->updateState(up, true);
+            }
+        }
+#ifndef QT_NO_ACCESSIBILITY
+        QAccessible::updateAccessibility(this, 0, QAccessible::ValueChanged);
+#endif
         return;
+    }
 …
     case Qt::Key_Enter:
     case Qt::Key_Return:
         d->edit->d_func()->modifiedState = d->edit->d_func()->undoState = 0;
+        d->edit->d_func()->control->clearUndo();
         d->interpret(d->keyboardTracking ? AlwaysEmit : EmitIfChanged);
         selectAll();
 …
     Q_D(QAbstractSpinBox);
+    if (d->buttonState & Keyboard && !event->isAutoRepeat()
+        && style()->styleHint(QStyle::SH_SpinBox_AnimateButton, 0, this)) {
+    if (d->buttonState & Keyboard && !event->isAutoRepeat())  {
         d->reset();
     } else {
 …
+}
+/*!
+    \internal
+    Used when acceleration is turned on. We need to get the
+    keyboard auto repeat rate from OS. This value is used as
+    argument when starting acceleration related timers.
+    Every platform should, either, use native calls to obtain
+    the value or hard code some reasonable rate.
+    Remember that time value should be given in msecs.
+*/
+static int getKeyboardAutoRepeatRate() {
+    int ret = 30;
+#if defined(Q_OS_SYMBIAN)
+    TTimeIntervalMicroSeconds32 initialTime;
+    TTimeIntervalMicroSeconds32 time;
+    S60->wsSession().GetKeyboardRepeatRate(initialTime, time);
+    ret = time.Int() / 1000; // msecs
+#elif defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
+    DWORD time;
+    if (SystemParametersInfo(SPI_GETKEYBOARDSPEED, 0, &time, 0) != FALSE)
+        ret = static_cast<int>(1000 / static_cast<int>(time)); // msecs
+#endif
+    return ret; // msecs
+}
 /*!
     \reimp
 …
         killTimer(d->spinClickThresholdTimerId);
         d->spinClickThresholdTimerId = -1;
+        d->spinClickTimerId = startTimer(d->spinClickTimerInterval);
+        d->effectiveSpinRepeatRate = d->buttonState & Keyboard
+                                     ? getKeyboardAutoRepeatRate()
+                                     : d->spinClickTimerInterval;
+        d->spinClickTimerId = startTimer(d->effectiveSpinRepeatRate);
         doStep = true;
     } else if (event->timerId() == d->spinClickTimerId) {
         if (d->accelerate) {
             d->acceleration = d->acceleration + (int)(d->spinClickTimerInterval * 0.05);
             if (d->spinClickTimerInterval - d->acceleration >= 10) {
+            d->acceleration = d->acceleration + (int)(d->effectiveSpinRepeatRate * 0.05);
+            if (d->effectiveSpinRepeatRate - d->acceleration >= 10) {
                 killTimer(d->spinClickTimerId);
                 d->spinClickTimerId = startTimer(d->spinClickTimerInterval - d->acceleration);
+                d->spinClickTimerId = startTimer(d->effectiveSpinRepeatRate - d->acceleration);
+            }
+        }
 …
     : edit(0), type(QVariant::Invalid), spinClickTimerId(-1),
       spinClickTimerInterval(100), spinClickThresholdTimerId(-1), spinClickThresholdTimerInterval(-1),
       buttonState(None), cachedText(QLatin1String("\x01")), cachedState(QValidator::Invalid),
       pendingEmit(false), readOnly(false), wrapping(false),
+      effectiveSpinRepeatRate(1), buttonState(None), cachedText(QLatin1String("\x01")),
+      cachedState(QValidator::Invalid), pendingEmit(false), readOnly(false), wrapping(false),
       ignoreCursorPositionChanged(false), frame(true), accelerate(false), keyboardTracking(true),
       cleared(false), ignoreUpdateEdit(false), correctionMode(QAbstractSpinBox::CorrectToPreviousValue),
 …
 */
 void QAbstractSpinBoxPrivate::updateState(bool up)
+void QAbstractSpinBoxPrivate::updateState(bool up, bool fromKeyboard /* = false */)
+{
     Q_Q(QAbstractSpinBox);
 …
                                   : QAbstractSpinBox::StepDownEnabled))) {
         spinClickThresholdTimerId = q->startTimer(spinClickThresholdTimerInterval);
         buttonState = (up ? (Mouse | Up) : (Mouse | Down));
+        buttonState = (up ? Up : Down) | (fromKeyboard ? Keyboard : Mouse);
         q->stepBy(up ? 1 : -1);
+#ifndef QT_NO_ACCESSIBILITY
+        QAccessible::updateAccessibility(q, 0, QAccessible::ValueChanged);
+#endif
+    }
+}
 …
     option->activeSubControls = QStyle::SC_None;
     option->buttonSymbols = d->buttonSymbols;
     option->subControls = QStyle::SC_SpinBoxFrame;
+    option->subControls = QStyle::SC_SpinBoxFrame | QStyle::SC_SpinBoxEditField;
     if (d->buttonSymbols != QAbstractSpinBox::NoButtons) {
         option->subControls |= QStyle::SC_SpinBoxUp | QStyle::SC_SpinBoxDown;
 …
 void QAbstractSpinBoxPrivate::setRange(const QVariant &min, const QVariant &max)
+{
+    Q_Q(QAbstractSpinBox);
     clearCache();
     minimum = min;
 …
         updateEdit();
+    }
+    q->updateGeometry();
+}
 …
         QASBDEBUG() << "QAbstractSpinBoxPrivate::interpret() text '"
                     << edit->displayText()
                     << "' >> '" << copy << "'"
                     << "' >> '" << tmp << "'";
+                    << "' >> '" << copy << '\''
+                    << "' >> '" << tmp << '\'';
         doInterpret = tmp != copy && (q->validate(tmp, pos) == QValidator::Acceptable);
 …
         return QValidator::Acceptable;
     if (!dptr->prefix.isEmpty() && !input.startsWith(dptr->prefix))
+    if (!dptr->prefix.isEmpty() && !input.startsWith(dptr->prefix)) {
         input.prepend(dptr->prefix);
+        pos += dptr->prefix.length();
+    }
     if (!dptr->suffix.isEmpty() && !input.endsWith(dptr->suffix))

trunk/src/gui/widgets/qabstractspinbox.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     bool event(QEvent *event);
+    QVariant inputMethodQuery(Qt::InputMethodQuery) const;
     virtual QValidator::State validate(QString &input, int &pos) const;
     virtual void fixup(QString &input) const;

trunk/src/gui/widgets/qabstractspinbox_p.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     void init();
     void reset();
     void updateState(bool up);
+    void updateState(bool up, bool fromKeyboard = false);
     QString stripped(const QString &text, int *pos = 0) const;
     bool specialValue() const;
 …
     QVariant::Type type;
     int spinClickTimerId, spinClickTimerInterval, spinClickThresholdTimerId, spinClickThresholdTimerInterval;
+    int effectiveSpinRepeatRate;
     uint buttonState;
     mutable QString cachedText;
 …
     mutable QSize cachedSizeHint, cachedMinimumSizeHint;
     uint pendingEmit : 1;
-    uint spindownEnabled : 1;
-    uint spinupEnabled : 1;
     uint readOnly : 1;
     uint wrapping : 1;

trunk/src/gui/widgets/qbuttongroup.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     \ingroup organizers
     \ingroup geomanagement
-    \ingroup appearance
-    \mainclass
     QButtonGroup provides an abstract container into which button widgets can
 …
 /*!
+    \fn void QButtonGroup::addButton(QAbstractButton *button, int id = -1);
+    \fn void QButtonGroup::addButton(QAbstractButton *button);
+    Adds the given \a button to the end of the group's internal list
+    of buttons.  An id will be assigned to the button by this
+    QButtonGroup. Automatically assigned ids are guaranteed to be
+    negative, starting with -2. If you are also assigning your own
+    ids, use positive values to avoid conflicts.
+    \sa removeButton() buttons()
+*/
+/*!
+    \fn void QButtonGroup::addButton(QAbstractButton *button, int id);
     Adds the given \a button to the button group, with the given \a
+    id. If \a id is -1 (the default), an id will be assigned to the
+    button by this QButtonGroup.
+    id. It is recommended to assign only positive ids.
     \sa removeButton() buttons()

trunk/src/gui/widgets/qbuttongroup.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/qcalendartextnavigator_p.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/qcalendarwidget.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     QString str;
     if (m_day / 10 == 0)
         str += QLatin1String("0");
+        str += QLatin1Char('0');
     str += QString::number(m_day);
     return highlightString(str, m_pos);
 …
         QString str;
         if (date.day() / 10 == 0)
             str += QLatin1String("0");
+            str += QLatin1Char('0');
         return str + QString::number(date.day());
     } else if (repeat == 3) {
 …
     QString str;
     if (m_month / 10 == 0)
         str += QLatin1String("0");
+        str += QLatin1Char('0');
     str += QString::number(m_month);
     return highlightString(str, m_pos);
 …
         QString str;
         if (date.month() / 10 == 0)
             str += QLatin1String("0");
+            str += QLatin1Char('0');
         return str + QString::number(date.month());
     } else if (repeat == 3) {
         return m_locale.standaloneMonthName(date.month(), QLocale::ShortFormat);
     } else if (repeat >= 4) {
+    } else /*if (repeat >= 4)*/ {
         return m_locale.standaloneMonthName(date.month(), QLocale::LongFormat);
+    }
-    return QString();
+}
 …
     for (int i = 0; i < 3; i++) {
         if (m_year / pow == 0)
             str += QLatin1String("0");
+            str += QLatin1Char('0');
         pow *= 10;
+    }
 …
         int year = date.year() % 100;
         if (year / 10 == 0)
             str = QLatin1String("0");
+            str = QLatin1Char('0');
         return str + QString::number(year);
+    }
 …
     int pos = 0;
     const QLatin1String quote("'");
+    const QLatin1Char quote('\'');
     bool quoting = false;
     QString separator;
 …
     calendar widget allowing the user to select a date.
     \since 4.2
+    \mainclass
     \ingroup advanced
 …
     The widget is initialized with the current month and year, but
     QCalendarWidget provides several public slots to change the year
+    and month that is shown.  The currently displayed month and year
+    can be retrieved using the currentPageMonth() and currentPageYear()
+    functions, respectively.
+    and month that is shown.
     By default, today's date is selected, and the user can select a
 …
     all. Note that a date also can be selected programmatically using
     the setSelectedDate() slot.
+    The currently displayed month and year can be retrieved using the
+    monthShown() and yearShown() functions, respectively.
     A newly created calendar widget uses abbreviated day names, and
 …
     int rows = 7;
     int cols = 8;
-    int startRow = 0;
-    int startCol = 0;
     const int marginH = (style()->pixelMetric(QStyle::PM_FocusFrameHMargin) + 1) * 2;
 …
     if (horizontalHeaderFormat() == QCalendarWidget::NoHorizontalHeader) {
         rows = 6;
-        startRow = 1;
     } else {
         for (int i = 1; i <= 7; i++) {
 …
     if (verticalHeaderFormat() == QCalendarWidget::NoVerticalHeader) {
         cols = 7;
-        startCol = 1;
     } else {
         for (int i = 1; i <= 6; i++) {
 …
     The currently displayed month and year can be retrieved using the
     currentPageMonth() and currentPageYear() functions respectively.
+    monthShown() and yearShown() functions respectively.
     \sa yearShown(), monthShown(), showPreviousMonth(), showNextMonth(),
 …
+{
     Q_D(QCalendarWidget);
+    QDate currentDate = d->getCurrentDate();
+    int day = currentDate.day();
+    int daysInMonths = QDate(year, month, 1).daysInMonth();
+    if (day > daysInMonths)
+        day = daysInMonths;
     d->showMonth(year, month);
+    QDate newDate(year, month, day);
+    int row = -1, col = -1;
+    d->m_model->cellForDate(newDate, &row, &col);
+    if (row != -1 && col != -1) {
+        d->m_view->selectionModel()->setCurrentIndex(d->m_model->index(row, col),
+                                                  QItemSelectionModel::NoUpdate);
+    }
+}
 …
     if (!min.isValid() || !max.isValid())
         return;
-    QDate minimum = min;
-    QDate maximum = max;
-    if (min > max) {
-        minimum = max;
-        maximum = min;
+    }
     QDate oldDate = d->m_model->m_date;
 …
+{
     Q_D(QCalendarWidget);
     if ( date.isNull() && !format.isValid() )
+    if (date.isNull())
         d->m_model->m_dateFormats.clear();
     else
 …
+{
     Q_D(QCalendarWidget);
+    if (event->type() == QEvent::MouseButtonPress && d->yearEdit->hasFocus() && !QRect(d->yearEdit->mapToGlobal(QPoint(0, 0)), d->yearEdit->size()).contains(static_cast<QMouseEvent *>(event)->globalPos())) {
+        event->accept();
+        d->_q_yearEditingFinished();
+        setFocus();
+        return true;
+    if (event->type() == QEvent::MouseButtonPress && d->yearEdit->hasFocus()) {
+        QWidget *tlw = window();
+        QWidget *widget = static_cast<QWidget*>(watched);
+        //as we have a event filter on the whole application we first make sure that the top level widget
+        //of both this and the watched widget are the same to decide if we should finish the year edition.
+        if (widget->window() == tlw) {
+            QPoint mousePos = widget->mapTo(tlw, static_cast<QMouseEvent *>(event)->pos());
+            QRect geom = QRect(d->yearEdit->mapTo(tlw, QPoint(0, 0)), d->yearEdit->size());
+            if (!geom.contains(mousePos)) {
+                event->accept();
+                d->_q_yearEditingFinished();
+                setFocus();
+                return true;
+            }
+        }
+    }
     return QWidget::eventFilter(watched, event);

trunk/src/gui/widgets/qcalendarwidget.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/qcheckbox.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     \ingroup basicwidgets
+    \mainclass
+    A QCheckBox is an option button that can be switched on (checked)
+    or off (unchecked). Checkboxes are typically used to represent
+    features in an application that can be enabled or disabled without
+    affecting others, but different types of behavior can be
+    implemented.
+    A QButtonGroup can be used to group check buttons visually.
+    A QCheckBox is an option button that can be switched on (checked) or off
+    (unchecked). Checkboxes are typically used to represent features in an
+    application that can be enabled or disabled without affecting others, but
+    different types of behavior can be implemented. For example, a
+    QButtonGroup can be used to group check buttons logically, allowing
+    exclusive checkboxes. However, QButtonGroup does not provide any visual
+    representation.
+    The image below further illustrates the differences between exclusive and
+    non-exclusive checkboxes.
+    \table
+    \row \o \inlineimage checkboxes-exclusive.png
+         \o \inlineimage checkboxes-non-exclusive.png
+    \endtable
     Whenever a checkbox is checked or cleared it emits the signal
+    stateChanged(). Connect to this signal if you want to trigger an
+    action each time the checkbox changes state. You can use
+    isChecked() to query whether or not a checkbox is checked.
+    In addition to the usual checked and unchecked states, QCheckBox
+    optionally provides a third state to indicate "no change". This
+    is useful whenever you need to give the user the option of neither
+    checking nor unchecking a checkbox. If you need this third state,
+    enable it with setTristate(), and use checkState() to query the current
+    toggle state.
+    Just like QPushButton, a checkbox displays text, and optionally a
+    small icon. The icon is set with setIcon(). The text can be set in
+    the constructor or with setText(). A shortcut key can be specified
+    by preceding the preferred character with an ampersand. For
+    example:
+    stateChanged(). Connect to this signal if you want to trigger an action
+    each time the checkbox changes state. You can use isChecked() to query
+    whether or not a checkbox is checked.
+    In addition to the usual checked and unchecked states, QCheckBox optionally
+    provides a third state to indicate "no change". This is useful whenever you
+    need to give the user the option of neither checking nor unchecking a
+    checkbox. If you need this third state, enable it with setTristate(), and
+    use checkState() to query the current toggle state.
+    Just like QPushButton, a checkbox displays text, and optionally a small
+    icon. The icon is set with setIcon(). The text can be set in the
+    constructor or with setText(). A shortcut key can be specified by preceding
+    the preferred character with an ampersand. For example:
     \snippet doc/src/snippets/code/src_gui_widgets_qcheckbox.cpp 0
+    In this example the shortcut is \e{Alt+A}. See the \l
+    {QShortcut#mnemonic}{QShortcut} documentation for details (to
+    display an actual ampersand, use '&&').
+    Important inherited functions: text(), setText(), text(),
+    pixmap(), setPixmap(), accel(), setAccel(), isToggleButton(),
+    setDown(), isDown(), isOn(), checkState(), autoRepeat(),
+    isExclusiveToggle(), group(), setAutoRepeat(), toggle(),
+    pressed(), released(), clicked(), toggled(), checkState(), and
+    stateChanged().
+    In this example the shortcut is \e{Alt+A}. See the \l{QShortcut#mnemonic}
+    {QShortcut} documentation for details (to display an actual ampersand,
+    use '&&').
+    Important inherited functions: text(), setText(), text(), pixmap(),
+    setPixmap(), accel(), setAccel(), isToggleButton(), setDown(), isDown(),
+    isOn(), checkState(), autoRepeat(), isExclusiveToggle(), group(),
+    setAutoRepeat(), toggle(), pressed(), released(), clicked(), toggled(),
+    checkState(), and stateChanged().
     \table 100%
+    \row \o \inlineimage macintosh-checkbox.png Screenshot of a Macintosh style checkbox
+         \o A checkbox shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}.
+    \row \o \inlineimage windows-checkbox.png Screenshot of a Windows XP style checkbox
+         \o A checkbox shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}.
+    \row \o \inlineimage plastique-checkbox.png Screenshot of a Plastique style checkbox
+         \o A checkbox shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}.
+    \row
+        \o \inlineimage macintosh-checkbox.png Screenshot of a Macintosh style checkbox
+        \o A checkbox shown in the \l{Macintosh Style Widget Gallery}{Macintosh widget style}.
+    \row
+        \o \inlineimage windows-checkbox.png Screenshot of a Windows XP style checkbox
+        \o A checkbox shown in the \l{Windows XP Style Widget Gallery}{Windows XP widget style}.
+    \row
+        \o \inlineimage plastique-checkbox.png Screenshot of a Plastique style checkbox
+        \o A checkbox shown in the \l{Plastique Style Widget Gallery}{Plastique widget style}.
     \endtable
 …
     \fn void QCheckBox::stateChanged(int state)
     This signal is emitted whenever the check box's state changes,
     i.e. whenever the user checks or unchecks it.
+    This signal is emitted whenever the check box's state changes, i.e.
+    whenever the user checks or unchecks it.
     \a state contains the check box's new Qt::CheckState.
 …
 /*!
     Initialize \a option with the values from this QCheckBox. This method is useful
     for subclasses when they need a QStyleOptionButton, but don't want to fill
     in all the information themselves.
+    Initializes \a option with the values from this QCheckBox. This method is
+    useful for subclasses that require a QStyleOptionButton, but do not want
+    to fill in all the information themselves.
     \sa QStyleOption::initFrom()
 …
     Constructs a checkbox with the given \a parent, but with no text.
     The \a parent argument is passed on to the QAbstractButton constructor.
+    \a parent is passed on to the QAbstractButton constructor.
 */
 …
     Constructs a checkbox with the given \a parent and \a text.
     The \a parent argument is passed on to the QAbstractButton constructor.
+    \a parent is passed on to the QAbstractButton constructor.
 */
 …
 /*!
+    Returns the check box's check state.
+    If you do not need tristate support, you can also
+    use \l QAbstractButton::isChecked() which returns
+    a boolean.
+    Returns the check box's check state. If you do not need tristate support,
+    you can also  use \l QAbstractButton::isChecked() which returns a boolean.
     \sa setCheckState() Qt::CheckState
 …
 /*!
+    Sets the check box's check state to \a state.
+    If you do not need tristate support, you can also
+    use \l QAbstractButton::setChecked() which takes
+    a boolean.
+    Sets the check box's check state to \a state. If you do not need tristate
+    support, you can also use \l QAbstractButton::setChecked() which takes a
+    boolean.
     \sa checkState() Qt::CheckState
 …
+/*!\reimp
+/*!
+    \reimp
 */
 QSize QCheckBox::sizeHint() const
 …
+}
+/*!\reimp
+/*!
+    \reimp
 */
 void QCheckBox::paintEvent(QPaintEvent *)
 …
+/*!\reimp*/
+/*!
+    \reimp
+*/
 bool QCheckBox::hitButton(const QPoint &pos) const
+{
 …
+}
+/*!\reimp*/
+/*!
+    \reimp
+*/
 void QCheckBox::checkStateSet()
+{
 …
+}
+/*!\reimp*/
+/*!
+    \reimp
+*/
 void QCheckBox::nextCheckState()
+{

trunk/src/gui/widgets/qcheckbox.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/qcocoamenu_mac.mm

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ****************************************************************************/
 …
                 = QApplication::activePopupWidget())
         popup->close();
+    qt_mac_emit_menuSignals(((QT_MANGLE_NAMESPACE(QCocoaMenu) *)menu)->qmenu, true);
+    QMenu *qtmenu = static_cast<QT_MANGLE_NAMESPACE(QCocoaMenu) *>(menu)->qmenu;
+    qt_mac_emit_menuSignals(qtmenu, true);
+    qt_mac_menu_collapseSeparators(menu, qtmenu->separatorsCollapsible());
+}

trunk/src/gui/widgets/qcocoamenu_mac_p.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 QT_FORWARD_DECLARE_CLASS(QMenu)
+@interface QT_MANGLE_NAMESPACE(QCocoaMenu) : NSMenu
+{
+    QMenu *qmenu;
+}
+- (id)initWithQMenu:(QMenu*)menu;
+#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5
+@protocol NSMenuDelegate <NSObject>
 - (void)menu:(NSMenu*)menu willHighlightItem:(NSMenuItem*)item;
 - (void)menuWillOpen:(NSMenu*)menu;
 …
 - (BOOL)hasShortcut:(NSMenu *)menu forKey:(NSString *)key forModifiers:(NSUInteger)modifier
   whichItem:(NSMenuItem**)outItem;
+@end
+#endif
+@interface QT_MANGLE_NAMESPACE(QCocoaMenu) : NSMenu <NSMenuDelegate>
+{
+    QMenu *qmenu;
+}
+- (id)initWithQMenu:(QMenu*)menu;
 - (BOOL)menuHasKeyEquivalent:(NSMenu *)menu forEvent:(NSEvent *)event target:(id *)target action:(SEL *)action;
 @end

trunk/src/gui/widgets/qcocoatoolbardelegate_mac.mm

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #include <private/qmainwindowlayout_p.h>
 #include <private/qt_mac_p.h>
+#include <private/qt_cocoa_helpers_mac_p.h>
 #include <private/qcocoaview_mac_p.h>
 #include <private/qwidget_p.h>
 …
     Q_UNUSED(flag);
     Q_UNUSED(nstoolbar);
+    QToolBar *tb = mainWindowLayout->cocoaItemIDToToolbarHash.value(QCFString::toQString(CFStringRef(itemIdentifier)));
+    QToolBar *tb = mainWindowLayout->cocoaItemIDToToolbarHash.value(
+            QT_PREPEND_NAMESPACE(qt_mac_NSStringToQString)(itemIdentifier));
     NSToolbarItem *item = nil;
     if (tb) {
 …
+{
     NSToolbarItem *item = [[notification userInfo] valueForKey:@"item"];
+    QToolBar *tb = mainWindowLayout->cocoaItemIDToToolbarHash.value(QCFString::toQString(CFStringRef([item itemIdentifier])));
+    QToolBar *tb = mainWindowLayout->cocoaItemIDToToolbarHash.value(
+            QT_PREPEND_NAMESPACE(qt_mac_NSStringToQString)([item itemIdentifier]));
     if (!tb)
         return; // I can't really do anything about this.
 …
     NSArray *items = [[qt_mac_window_for(mainWindowLayout->layoutState.mainWindow->window()) toolbar] items];
     int someIndex = 0;
-    bool foundItem = false;
     for (NSToolbarItem *i in items) {
+        if (i == item) {
+            foundItem = true;
+        if (i == item)
             break;
+        }
         ++someIndex;
+    }

trunk/src/gui/widgets/qcocoatoolbardelegate_mac_p.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/qcombobox.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #include "qinputcontext.h"
 #endif
+#include <private/qapplication_p.h>
 #include <private/qcombobox_p.h>
 #include <private/qabstractitemmodel_p.h>
 #include <private/qabstractscrollarea_p.h>
+#include <private/qsoftkeymanager_p.h>
 #include <qdebug.h>
 #ifdef Q_WS_X11
 #include <private/qt_x11_p.h>
 …
 #endif
 QT_BEGIN_NAMESPACE
-extern QHash<QByteArray, QFont> *qt_app_fonts_hash();
 QComboBoxPrivate::QComboBoxPrivate()
 …
     // Make sure fonts set on the combo box also overrides the font for the popup menu.
+    if (mCombo->testAttribute(Qt::WA_SetFont) || mCombo->testAttribute(Qt::WA_MacSmallSize)
+            || mCombo->testAttribute(Qt::WA_MacMiniSize))
+    if (mCombo->testAttribute(Qt::WA_SetFont)
+            || mCombo->testAttribute(Qt::WA_MacSmallSize)
+            || mCombo->testAttribute(Qt::WA_MacMiniSize)
+            || mCombo->font() != qt_app_fonts_hash()->value("QComboBox", QFont()))
         menuOption.font = mCombo->font();
     else
 …
         updateLineEditGeometry();
+    }
+    if (currentIndex.row() != indexBeforeChange)
+        _q_emitCurrentIndexChanged(currentIndex);
     q->update();
+}
 …
         // height
         sh.setHeight(qMax(fm.lineSpacing(), 14) + 2);
+        sh.setHeight(qMax(fm.height(), 14) + 2);
         if (hasIcon) {
             sh.setHeight(qMax(sh.height(), iconSize.height() + 2));
 …
 /*
-    Sets currentIndex on entered if the LeftButton is not pressed. This
-    means that if mouseTracking(...) is on, we setCurrentIndex and select
-    even when LeftButton is not pressed.
-*/
-void QComboBoxPrivateContainer::setCurrentIndex(const QModelIndex &index)
+{
-    if (QComboBoxDelegate::isSeparator(index))
-        return;
-    view->setCurrentIndex(index);
+}
-/*
     Returns the item view used for the combobox popup.
 */
 …
                    this, SLOT(updateScrollers()));
 #endif
-        disconnect(view, SIGNAL(entered(QModelIndex)),
-                   this, SLOT(setCurrentIndex(QModelIndex)));
         disconnect(view, SIGNAL(destroyed()),
                    this, SLOT(viewDestroyed()));
         delete view;
         view = 0;
 …
             this, SLOT(updateScrollers()));
 #endif
-    connect(view, SIGNAL(entered(QModelIndex)),
-            this, SLOT(setCurrentIndex(QModelIndex)));
     connect(view, SIGNAL(destroyed()),
             this, SLOT(viewDestroyed()));
+#ifdef QT_SOFTKEYS_ENABLED
+    selectAction = QSoftKeyManager::createKeyedAction(QSoftKeyManager::SelectSoftKey, Qt::Key_Select, itemView);
+    cancelAction = QSoftKeyManager::createKeyedAction(QSoftKeyManager::CancelSoftKey, Qt::Key_Escape, itemView);
+    addAction(selectAction);
+    addAction(cancelAction);
+#endif
+}
 …
         case Qt::Key_F4:
         case Qt::Key_Escape:
-#ifdef QT_KEYPAD_NAVIGATION
-        case Qt::Key_Back:
-#endif
             combo->hidePopup();
             return true;
 …
+        }
     break;
     case QEvent::MouseMove: {
+    case QEvent::MouseMove:
         if (isVisible()) {
             QMouseEvent *m = static_cast<QMouseEvent *>(e);
 …
             if (vector.manhattanLength() > 9 && blockMouseReleaseTimer.isActive())
                 blockMouseReleaseTimer.stop();
+            QModelIndex indexUnderMouse = view->indexAt(m->pos());
+            if (indexUnderMouse.isValid() && indexUnderMouse != view->currentIndex()
+                    && !QComboBoxDelegate::isSeparator(indexUnderMouse)) {
+                view->setCurrentIndex(indexUnderMouse);
+            }
+        }
         break;
+    }
     case QEvent::MouseButtonRelease: {
         QMouseEvent *m = static_cast<QMouseEvent *>(e);
 …
     \ingroup basicwidgets
+    \mainclass
     A QComboBox provides a means of presenting a list of options to the user
 …
     setLayoutItemMargins(QStyle::SE_ComboBoxLayoutItem);
     q->setModel(new QStandardItemModel(0, 1, q));
+    q->setAttribute(Qt::WA_InputMethodEnabled);
+    if (!q->isEditable())
+        q->setAttribute(Qt::WA_InputMethodEnabled, false);
+    else
+        q->setAttribute(Qt::WA_InputMethodEnabled);
+}
 …
     container->itemView()->setModel(model);
     container->itemView()->setTextElideMode(Qt::ElideMiddle);
     updateDelegate();
+    updateDelegate(true);
     updateLayoutDirection();
+    updateViewContainerPaletteAndOpacity();
     QObject::connect(container, SIGNAL(itemSelected(QModelIndex)),
                      q, SLOT(_q_itemSelected(QModelIndex)));
 …
+}
-void QComboBoxPrivate::_q_rowsAboutToBeInserted(const QModelIndex & parent,
-                                             int /*start*/, int /*end*/)
+{
-    if (parent != root)
-        return;
-    indexBeforeChange = currentIndex.row();
+}
 void QComboBoxPrivate::_q_rowsInserted(const QModelIndex &parent, int start, int end)
+{
 …
+}
+void QComboBoxPrivate::_q_rowsAboutToBeRemoved(const QModelIndex &parent, int /*start*/, int /*end*/)
+{
+    if (parent != root)
+        return;
+void QComboBoxPrivate::_q_updateIndexBeforeChange()
+{
     indexBeforeChange = currentIndex.row();
+}
 …
+}
+void QComboBoxPrivate::updateViewContainerPaletteAndOpacity()
+{
+    if (!container)
+        return;
+    Q_Q(QComboBox);
+    QStyleOptionComboBox opt;
+    q->initStyleOption(&opt);
+#ifndef QT_NO_MENU
+    if (q->style()->styleHint(QStyle::SH_ComboBox_Popup, &opt, q)) {
+        QMenu menu;
+        menu.ensurePolished();
+        container->setPalette(menu.palette());
+        container->setWindowOpacity(menu.windowOpacity());
+    } else
+#endif
+    {
+        container->setPalette(q->palette());
+        container->setWindowOpacity(1.0);
+    }
+}
 /*!
 …
+}
+Qt::MatchFlags QComboBoxPrivate::matchFlags() const
+{
+    // Base how duplicates are determined on the autocompletion case sensitivity
+    Qt::MatchFlags flags = Qt::MatchFixedString;
+#ifndef QT_NO_COMPLETER
+    if (!lineEdit->completer() || lineEdit->completer()->caseSensitivity() == Qt::CaseSensitive)
+#endif
+        flags |= Qt::MatchCaseSensitive;
+    return flags;
+}
+void QComboBoxPrivate::_q_editingFinished()
+{
+    Q_Q(QComboBox);
+    if (lineEdit && !lineEdit->text().isEmpty()) {
+        //here we just check if the current item was entered
+        const int index = q_func()->findText(lineEdit->text(), matchFlags());
+        if (index != -1 && itemText(currentIndex) != lineEdit->text()) {
+            q->setCurrentIndex(index);
+            emitActivated(currentIndex);
+        }
+    }
+}
 void QComboBoxPrivate::_q_returnPressed()
+{
 …
         int index = -1;
         if (!duplicatesEnabled) {
+            // Base how duplicates are determined on the autocompletion case sensitivity
+            Qt::MatchFlags flags = Qt::MatchFixedString;
+#ifndef QT_NO_COMPLETER
+            if (!lineEdit->completer() || lineEdit->completer()->caseSensitivity() == Qt::CaseSensitive)
+#endif
+                flags |= Qt::MatchCaseSensitive;
+            index = q->findText(text, flags);
+            index = q->findText(text, matchFlags());
             if (index != -1) {
                 q->setCurrentIndex(index);
 …
     Q_D(QComboBox);
+    disconnect(d->model, SIGNAL(destroyed()),
+               this, SLOT(_q_modelDestroyed()));
+    QT_TRY {
+        disconnect(d->model, SIGNAL(destroyed()),
+                this, SLOT(_q_modelDestroyed()));
+    } QT_CATCH(...) {
+        ; // objects can't throw in destructor
+    }
+}
 …
+}
+void QComboBoxPrivate::updateDelegate()
+/*! \internal
+    update the default delegate
+    depending on the style's SH_ComboBox_Popup hint, we use a different default delegate.
+    but we do not change the delegate is the combobox use a custom delegate,
+    unless \a force is set to true.
+ */
+void QComboBoxPrivate::updateDelegate(bool force)
+{
     Q_Q(QComboBox);
     QStyleOptionComboBox opt;
     q->initStyleOption(&opt);
+    if (q->style()->styleHint(QStyle::SH_ComboBox_Popup, &opt, q))
+        q->setItemDelegate(new QComboMenuDelegate(q->view(), q));
+    else
+        q->setItemDelegate(new QComboBoxDelegate(q->view(), q));
+    if (q->style()->styleHint(QStyle::SH_ComboBox_Popup, &opt, q)) {
+        if (force || qobject_cast<QComboBoxDelegate *>(q->itemDelegate()))
+            q->setItemDelegate(new QComboMenuDelegate(q->view(), q));
+    } else {
+        if (force || qobject_cast<QComboMenuDelegate *>(q->itemDelegate()))
+            q->setItemDelegate(new QComboBoxDelegate(q->view(), q));
+    }
+}
 …
         d->lineEdit->setParent(this);
     connect(d->lineEdit, SIGNAL(returnPressed()), this, SLOT(_q_returnPressed()));
+    connect(d->lineEdit, SIGNAL(editingFinished()), this, SLOT(_q_editingFinished()));
     connect(d->lineEdit, SIGNAL(textChanged(QString)), this, SIGNAL(editTextChanged(QString)));
 #ifdef QT3_SUPPORT
 …
                    this, SLOT(_q_dataChanged(QModelIndex,QModelIndex)));
         disconnect(d->model, SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)),
                    this, SLOT(_q_rowsAboutToBeInserted(QModelIndex,int,int)));
+                   this, SLOT(_q_updateIndexBeforeChange()));
         disconnect(d->model, SIGNAL(rowsInserted(QModelIndex,int,int)),
                    this, SLOT(_q_rowsInserted(QModelIndex,int,int)));
         disconnect(d->model, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)),
                    this, SLOT(_q_rowsAboutToBeRemoved(QModelIndex,int,int)));
+                   this, SLOT(_q_updateIndexBeforeChange()));
         disconnect(d->model, SIGNAL(rowsRemoved(QModelIndex,int,int)),
                    this, SLOT(_q_rowsRemoved(QModelIndex,int,int)));
         disconnect(d->model, SIGNAL(destroyed()),
                    this, SLOT(_q_modelDestroyed()));
+        disconnect(d->model, SIGNAL(modelAboutToBeReset()),
+                   this, SLOT(_q_updateIndexBeforeChange()));
         disconnect(d->model, SIGNAL(modelReset()),
                    this, SLOT(_q_modelReset()));
 …
             this, SLOT(_q_dataChanged(QModelIndex,QModelIndex)));
     connect(model, SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)),
             this, SLOT(_q_rowsAboutToBeInserted(QModelIndex,int,int)));
+            this, SLOT(_q_updateIndexBeforeChange()));
     connect(model, SIGNAL(rowsInserted(QModelIndex,int,int)),
             this, SLOT(_q_rowsInserted(QModelIndex,int,int)));
     connect(model, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)),
             this, SLOT(_q_rowsAboutToBeRemoved(QModelIndex,int,int)));
+            this, SLOT(_q_updateIndexBeforeChange()));
     connect(model, SIGNAL(rowsRemoved(QModelIndex,int,int)),
             this, SLOT(_q_rowsRemoved(QModelIndex,int,int)));
     connect(model, SIGNAL(destroyed()),
             this, SLOT(_q_modelDestroyed()));
+    connect(model, SIGNAL(modelAboutToBeReset()),
+            this, SLOT(_q_updateIndexBeforeChange()));
     connect(model, SIGNAL(modelReset()),
             this, SLOT(_q_modelReset()));
 …
         QString newText = q->itemText(currentIndex.row());
         if (lineEdit->text() != newText)
             lineEdit->setText(q->itemText(currentIndex.row()));
+            lineEdit->setText(newText);
         updateLineEditGeometry();
+    }
 …
     Removes the item at the given \a index from the combobox.
     This will update the current index if the index is removed.
+    This function does nothing if \a index is out of range.
 */
 void QComboBox::removeItem(int index)
+{
+    Q_ASSERT(index >= 0 && index < count());
+    Q_D(QComboBox);
+    Q_D(QComboBox);
+    if (index < 0 || index >= count())
+        return;
     d->model->removeRows(index, 1, d->root);
+}
 …
     container->setGeometry(listRect);
+    bool updatesEnabled = container->updatesEnabled();
+#ifndef Q_WS_MAC
+    const bool updatesEnabled = container->updatesEnabled();
+#endif
 #if defined(Q_WS_WIN) && !defined(QT_NO_EFFECTS)
     bool scrollDown = (listRect.topLeft() == below);
     if (QApplication::isEffectEnabled(Qt::UI_AnimateCombo)
+    if (QApplication::isEffectEnabled(Qt::UI_AnimateCombo)
         && !style->styleHint(QStyle::SH_ComboBox_Popup, &opt, this) && !window()->testAttribute(Qt::WA_DontShowOnScreen))
         qScrollEffect(container, scrollDown ? QEffects::DownScroll : QEffects::UpScroll, 150);
 #endif
+// Don't disable updates on Mac OS X. Windows are displayed immediately on this platform,
+// which means that the window will be visible before the call to container->show() returns.
+// If updates are disabled at this point we'll miss our chance at painting the popup
+// menu before it's shown, causing flicker since the window then displays the standard gray
+// background.
+#ifndef Q_WS_MAC
     container->setUpdatesEnabled(false);
+#endif
     container->raise();
     container->show();
 …
                              : QAbstractItemView::EnsureVisible);
+#ifndef Q_WS_MAC
     container->setUpdatesEnabled(updatesEnabled);
+#endif
     container->update();
+#ifdef QT_KEYPAD_NAVIGATION
+    if (QApplication::keypadNavigationEnabled())
+        view()->setEditFocus(true);
+#endif
+}
 …
         break;
     case QEvent::PaletteChange: {
+        QStyleOptionComboBox opt;
+        initStyleOption(&opt);
+#ifndef QT_NO_MENU
+        if (style()->styleHint(QStyle::SH_ComboBox_Popup, &opt, this)) {
+            QMenu menu;
+            menu.ensurePolished();
+            d->viewContainer()->setPalette(menu.palette());
+            d->viewContainer()->setWindowOpacity(menu.windowOpacity());
+        } else
+#endif
+        {
+            d->viewContainer()->setPalette(palette());
+            d->viewContainer()->setWindowOpacity(1.0);
+        }
+        d->updateViewContainerPaletteAndOpacity();
         break;
+    }

trunk/src/gui/widgets/qcombobox.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 QT_MODULE(Gui)
 #ifndef QT_NO_COMBOBOX
 …
     Q_PRIVATE_SLOT(d_func(), void _q_emitHighlighted(const QModelIndex &))
     Q_PRIVATE_SLOT(d_func(), void _q_emitCurrentIndexChanged(const QModelIndex &index))
+    Q_PRIVATE_SLOT(d_func(), void _q_editingFinished())
     Q_PRIVATE_SLOT(d_func(), void _q_returnPressed())
     Q_PRIVATE_SLOT(d_func(), void _q_resetButton())
     Q_PRIVATE_SLOT(d_func(), void _q_dataChanged(const QModelIndex &, const QModelIndex &))
     Q_PRIVATE_SLOT(d_func(), void _q_rowsAboutToBeInserted(const QModelIndex & parent, int start, int end))
+    Q_PRIVATE_SLOT(d_func(), void _q_updateIndexBeforeChange())
     Q_PRIVATE_SLOT(d_func(), void _q_rowsInserted(const QModelIndex & parent, int start, int end))
-    Q_PRIVATE_SLOT(d_func(), void _q_rowsAboutToBeRemoved(const QModelIndex & parent, int start, int end))
     Q_PRIVATE_SLOT(d_func(), void _q_rowsRemoved(const QModelIndex & parent, int start, int end))
     Q_PRIVATE_SLOT(d_func(), void _q_modelDestroyed())

trunk/src/gui/widgets/qcombobox_p.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 QT_BEGIN_NAMESPACE
+class QAction;
 class QComboBoxListView : public QListView
 …
     void scrollItemView(int action);
     void updateScrollers();
-    void setCurrentIndex(const QModelIndex &index);
     void viewDestroyed();
 …
     QComboBoxPrivateScroller *top;
     QComboBoxPrivateScroller *bottom;
+#ifdef QT_SOFTKEYS_ENABLED
+    QAction *selectAction;
+    QAction *cancelAction;
+#endif
 };
 class QComboMenuDelegate : public QAbstractItemDelegate
+{
+{ Q_OBJECT
 public:
     QComboMenuDelegate(QObject *parent, QComboBox *cmb) : QAbstractItemDelegate(parent), mCombo(cmb) {}
 …
 // be other side effects from using the new class
 class QComboBoxDelegate : public QItemDelegate
+{
+{ Q_OBJECT
 public:
     QComboBoxDelegate(QObject *parent, QComboBox *cmb) : QItemDelegate(parent), mCombo(cmb) {}
     static bool isSeparator(const QModelIndex &index) {
         return index.data(Qt::AccessibleDescriptionRole).toString() == QString::fromLatin1("separator");
+        return index.data(Qt::AccessibleDescriptionRole).toString() == QLatin1String("separator");
+    }
     static void setSeparator(QAbstractItemModel *model, const QModelIndex &index) {
 …
     QComboBoxPrivateContainer* viewContainer();
     void updateLineEditGeometry();
+    Qt::MatchFlags matchFlags() const;
+    void _q_editingFinished();
     void _q_returnPressed();
     void _q_complete();
 …
     void _q_resetButton();
     void _q_dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
     void _q_rowsAboutToBeInserted(const QModelIndex & parent, int start, int end);
+    void _q_updateIndexBeforeChange();
     void _q_rowsInserted(const QModelIndex & parent, int start, int end);
-    void _q_rowsAboutToBeRemoved(const QModelIndex & parent, int start, int end);
     void _q_rowsRemoved(const QModelIndex & parent, int start, int end);
     void updateArrow(QStyle::StateFlag state);
 …
     void updateLayoutDirection();
     void setCurrentIndex(const QModelIndex &index);
     void updateDelegate();
+    void updateDelegate(bool force = false);
     void keyboardSearchString(const QString &text);
     void modelChanged();
+    void updateViewContainerPaletteAndOpacity();
     QAbstractItemModel *model;

trunk/src/gui/widgets/qcommandlinkbutton.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     \ingroup basicwidgets
+    \mainclass
     The command link is a new control that was introduced by Windows Vista. It's
 …
         font.setPointSizeF(9.0);
+    }
+    return font;
+    // Note the font will be resolved against
+    // QPainters font, so we need to restore the mask
+    int resolve_mask = font.resolve_mask;
+    QFont modifiedFont = q->font().resolve(font);
+    modifiedFont.detach();
+    modifiedFont.resolve_mask = resolve_mask;
+    return modifiedFont;
+}
 …
     QFont font = q->font();
     font.setPointSizeF(9.0);
+    return font;
+    // Note the font will be resolved against
+    // QPainters font, so we need to restore the mask
+    int resolve_mask = font.resolve_mask;
+    QFont modifiedFont = q->font().resolve(font);
+    modifiedFont.detach();
+    modifiedFont.resolve_mask = resolve_mask;
+    return modifiedFont;
+}
 …
     q->setIconSize(QSize(20, 20));
+    q->setIcon(q->style()->standardIcon(QStyle::SP_CommandLink));
+    QStyleOptionButton opt;
+    q->initStyleOption(&opt);
+    q->setIcon(q->style()->standardIcon(QStyle::SP_CommandLink, &opt));
+}
 …
     int heightWithoutDescription = d->descriptionOffset() + d->bottomMargin();
     // find the width available for the description area
+    return heightWithoutDescription + d->descriptionHeight(width);
+    return qMax(heightWithoutDescription + d->descriptionHeight(width),
+                iconSize().height() + d->topMargin() + d->bottomMargin());
+}

trunk/src/gui/widgets/qcommandlinkbutton.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/qdatetimeedit.cpp

-              r2
+              r561
 /****************************************************************************)
+/****************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
   \ingroup basicwidgets
+  \mainclass
   QDateTimeEdit allows the user to edit dates by using the keyboard or
 …
   \brief the QDateTime that is set in the QDateTimeEdit
+  When setting this property the timespec of the QDateTimeEdit remains the same
+  and the timespec of the new QDateTime is ignored.
   By default, this property contains a date that refers to January 1,
 and a time of 00:00:00 and 0 milliseconds.
 …
         if (!(d->sections & DateSections_Mask))
             setDateRange(datetime.date(), datetime.date());
         d->setValue(QVariant(datetime), EmitIfChanged);
+        d->setValue(QDateTime(datetime.date(), datetime.time(), d->spec), EmitIfChanged);
+    }
+}
 …
     \brief the current timespec used by the date time edit.
     \since 4.4
-    All dates/passed to the date time edit will be converted to this
-    timespec.
 */
 …
                 //hide cursor
                 d->edit->d_func()->setCursorVisible(false);
+                if (d->edit->d_func()->cursorTimer > 0)
+                    killTimer(d->edit->d_func()->cursorTimer);
+                d->edit->d_func()->cursorTimer = 0;
+                d->edit->d_func()->control->setCursorBlinkPeriod(0);
                 d->setSelected(0);
+            }
 …
             //hide cursor
             d->edit->d_func()->setCursorVisible(false);
+            if (d->edit->d_func()->cursorTimer > 0)
+                killTimer(d->edit->d_func()->cursorTimer);
+            d->edit->d_func()->cursorTimer = 0;
+            d->edit->d_func()->control->setCursorBlinkPeriod(0);
             d->setSelected(0);
             oldCurrent = 0;
 …
     case Qt::Key_Right:
         if (event->key() == Qt::Key_Left || event->key() == Qt::Key_Right) {
+            if (
 #ifdef QT_KEYPAD_NAVIGATION
+            if (!QApplication::keypadNavigationEnabled() || !hasEditFocus()) {
+                select = false;
+                break;
+            }
+#else
+            if (!(event->modifiers() & Qt::ControlModifier)) {
+                QApplication::keypadNavigationEnabled() && !hasEditFocus()
+                || !QApplication::keypadNavigationEnabled() &&
+#endif
+                !(event->modifiers() & Qt::ControlModifier)) {
                 select = false;
                 break;
+            }
 #ifdef Q_WS_MAC
+            else {
+            else
+#ifdef QT_KEYPAD_NAVIGATION
+                if (!QApplication::keypadNavigationEnabled())
+#endif
+            {
                 select = (event->modifiers() & Qt::ShiftModifier);
                 break;
+            }
 #endif
-#endif // QT_KEYPAD_NAVIGATION
+        }
         // else fall through
 …
   \ingroup basicwidgets
+  \mainclass
   Many of the properties and functions provided by QTimeEdit are implemented in
 …
   \ingroup basicwidgets
+  \mainclass
   Many of the properties and functions provided by QDateEdit are implemented in
 …
     currentSectionIndex = FirstSectionIndex;
-    layoutDirection = QApplication::layoutDirection();
     first.type = FirstSection;
     last.type = LastSection;
 …
 /*!
   \internal
-  \reimp
 */
 …
 /*!
   \internal
-  \reimp
   This function's name is slightly confusing; it is not to be confused
 …
 /*!
   \internal
-  \reimp
 */
 …
 /*!
   \internal
-  \reimp
 */
 …
     optCombo.init(this);
     optCombo.editable = true;
+        optCombo.frame = opt.frame;
     optCombo.subControls = opt.subControls;
     optCombo.activeSubControls = opt.activeSubControls;
 …
 #endif
     updateTimeSpec();
+    q->setInputMethodHints(Qt::ImhPreferNumbers);
     setLayoutItemMargins(QStyle::SE_DateTimeEditLayoutItem);
+}

trunk/src/gui/widgets/qdatetimeedit.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/qdatetimeedit_p.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
                                    bool fixup = false) const;
     void clearSection(int index);
     virtual QString displayText() const { return edit->displayText(); } // this is from QDateTimeParser
+    virtual QString displayText() const { return edit->text(); } // this is from QDateTimeParser
     int absoluteIndex(QDateTimeEdit::Section s, int index) const;
 …
     QString defaultDateFormat, defaultTimeFormat, defaultDateTimeFormat, unreversedFormat;
-    Qt::LayoutDirection layoutDirection;
     mutable QVariant conflictGuard;
     bool hasHadFocus, formatExplicitlySet, calendarPopup;

trunk/src/gui/widgets/qdial.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #include "qaccessible.h"
 #endif
+#include <qmath.h>
 QT_BEGIN_NAMESPACE
 …
     double yy = (double)q->height()/2.0 - p.y();
     double xx = (double)p.x() - q->width()/2.0;
     double a = (xx || yy) ? atan2(yy, xx) : 0;
+    double a = (xx || yy) ? qAtan2(yy, xx) : 0;
     if (a < Q_PI / -2)
 …
     \ingroup basicwidgets
+    \mainclass
     QDial is used when the user needs to control a value within a

trunk/src/gui/widgets/qdial.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/qdialogbuttonbox.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #include <QtGui/qapplication.h>
 #include <QtGui/private/qwidget_p.h>
+#include <QtGui/qaction.h>
 #include "qdialogbuttonbox.h"
+#ifdef QT_SOFTKEYS_ENABLED
+#include <QtGui/qaction.h>
+#endif
 QT_BEGIN_NAMESPACE
 …
     layout that is appropriate to the current widget style.
     \ingroup application
+    \mainclass
+    \ingroup dialog-classes
     Dialogs and message boxes typically present buttons in a layout that
 …
 };
+class QDialogButtonEnabledProxy : public QObject
+{
+public:
+    QDialogButtonEnabledProxy(QObject *parent, QWidget *src, QAction *trg) : QObject(parent), source(src), target(trg)
+    {
+        source->installEventFilter(this);
+        target->setEnabled(source->isEnabled());
+    }
+    ~QDialogButtonEnabledProxy()
+    {
+        source->removeEventFilter(this);
+    }
+    bool eventFilter(QObject *object, QEvent *event)
+    {
+        if (object == source && event->type() == QEvent::EnabledChange) {
+            target->setEnabled(source->isEnabled());
+        }
+        return false;
+    };
+private:
+    QWidget *source;
+    QAction *target;
+};
 class QDialogButtonBoxPrivate : public QWidgetPrivate
+{
 …
     QList<QAbstractButton *> buttonLists[QDialogButtonBox::NRoles];
     QHash<QPushButton *, QDialogButtonBox::StandardButton> standardButtonHash;
+#ifdef QT_SOFTKEYS_ENABLED
+    QHash<QAbstractButton *, QAction *> softKeyActions;
+#endif
     Qt::Orientation orientation;
 …
     void retranslateStrings();
     const char *standardButtonText(QDialogButtonBox::StandardButton sbutton) const;
+#ifdef QT_SOFTKEYS_ENABLED
+    QAction *createSoftKey(QAbstractButton *button, QDialogButtonBox::ButtonRole role);
+#endif
 };
 …
+    }
         int left, top, right, bottom;
+    int left, top, right, bottom;
     setLayoutItemMargins(QStyle::SE_PushButtonLayoutItem);
         getLayoutItemMargins(&left, &top, &right, &bottom);
+    getLayoutItemMargins(&left, &top, &right, &bottom);
     buttonLayout->setContentsMargins(-left, -top, -right, -bottom);
 …
+{
     Q_Q(QDialogButtonBox);
     const int MacGap = 36 - 8;  // 8 is the default gap between a widget and a spacer item
+    const int MacGap = 36 - 8;    // 8 is the default gap between a widget and a spacer item
     for (int i = buttonLayout->count() - 1; i >= 0; --i) {
 …
     QObject::connect(button, SIGNAL(destroyed()), q, SLOT(_q_handleButtonDestroyed()));
     buttonLists[role].append(button);
+#ifdef QT_SOFTKEYS_ENABLED
+    QAction *action = createSoftKey(button, role);
+    softKeyActions.insert(button, action);
+    new QDialogButtonEnabledProxy(action, button, action);
+#endif
     if (doLayout)
         layoutButtons();
+}
+#ifdef QT_SOFTKEYS_ENABLED
+QAction* QDialogButtonBoxPrivate::createSoftKey(QAbstractButton *button, QDialogButtonBox::ButtonRole role)
+{
+    Q_Q(QDialogButtonBox);
+    QAction::SoftKeyRole softkeyRole;
+    QAction *action = new QAction(button->text(), button);
+    switch (role) {
+    case ApplyRole:
+    case AcceptRole:
+    case YesRole:
+    case ActionRole:
+    case HelpRole:
+        softkeyRole = QAction::PositiveSoftKey;
+        break;
+    case RejectRole:
+    case DestructiveRole:
+    case NoRole:
+    case ResetRole:
+        softkeyRole = QAction::NegativeSoftKey;
+        break;
+    default:
+        break;
+    }
+    QObject::connect(action, SIGNAL(triggered()), button, SIGNAL(clicked()));
+    action->setSoftKeyRole(softkeyRole);
+    QWidget *dialog = 0;
+    QWidget *p = q;
+    while (p && !p->isWindow()) {
+        p = p->parentWidget();
+        if ((dialog = qobject_cast<QDialog *>(p)))
+            break;
+    }
+    if (dialog) {
+        dialog->addAction(action);
+    } else {
+        q->addAction(action);
+    }
+    return action;
+}
+#endif
 void QDialogButtonBoxPrivate::createStandardButtons(QDialogButtonBox::StandardButtons buttons)
 …
             QPushButton *button = it.key();
             button->setText(QDialogButtonBox::tr(buttonText));
+#ifdef QT_SOFTKEYS_ENABLED
+            QAction *action = softKeyActions.value(button, 0);
+            if (action)
+                action->setText(button->text());
+#endif
+        }
         ++it;
 …
+{
     Q_D(QDialogButtonBox);
+#ifdef QT_SOFTKEYS_ENABLED
+    // Delete softkey actions as they have the buttons as parents
+    qDeleteAll(d->softKeyActions.values());
+    d->softKeyActions.clear();
+#endif
     // Remove the created standard buttons, they should be in the other lists, which will
     // do the deletion
 …
+        }
+    }
+#ifdef QT_SOFTKEYS_ENABLED
+    QAction *action = d->softKeyActions.value(button, 0);
+    if (action) {
+        d->softKeyActions.remove(button);
+        delete action;
+    }
+#endif
     if (!d->internalRemove)
         button->setParent(0);
 …
+{
     Q_D(QDialogButtonBox);
+#ifdef QT_SOFTKEYS_ENABLED
+    // Delete softkey actions since they have the buttons as parents
+    qDeleteAll(d->softKeyActions.values());
+    d->softKeyActions.clear();
+#endif
     // Clear out all the old standard buttons, then recreate them.
     qDeleteAll(d->standardButtonHash.keys());
 …
         if (!hasDefault && firstAcceptButton)
             firstAcceptButton->setDefault(true);
+#ifdef QT_SOFTKEYS_ENABLED
+        if (dialog)
+            setFixedSize(0,0);
+#endif
     }else if (event->type() == QEvent::LanguageChange) {
         d->retranslateStrings();
+    }
+#ifdef QT_SOFTKEYS_ENABLED
+    else if (event->type() == QEvent::ParentChange) {
+        QWidget *dialog = 0;
+        QWidget *p = this;
+        while (p && !p->isWindow()) {
+            p = p->parentWidget();
+            if ((dialog = qobject_cast<QDialog *>(p)))
+                break;
+        }
+        // If the parent changes, then move the softkeys
+        for (QHash<QAbstractButton *, QAction *>::const_iterator it = d->softKeyActions.constBegin();
+            it != d->softKeyActions.constEnd(); ++it) {
+            QAction *current = it.value();
+            QList<QWidget *> widgets = current->associatedWidgets();
+            foreach (QWidget *w, widgets)
+                w->removeAction(current);
+            if (dialog)
+                dialog->addAction(current);
+            else
+                addAction(current);
+        }
+    }
+#endif
     return QWidget::event(event);

trunk/src/gui/widgets/qdialogbuttonbox.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/qdockarealayout.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
+}
+bool QDockAreaLayoutItem::hasFixedSize(Qt::Orientation o) const
+{
+    return perp(o, minimumSize()) == perp(o, maximumSize());
+}
 bool QDockAreaLayoutItem::expansive(Qt::Orientation o) const
+{
 …
 QDockAreaLayoutInfo::QDockAreaLayoutInfo()
     : sep(0), dockPos(QInternal::LeftDock), o(Qt::Horizontal), rect(0, 0, -1, -1), mainWindow(0)
 #ifndef QT_NO_TABBAR
     , tabbed(false), tabBar(0), tabBarShape(QTabBar::RoundedSouth)
+    : sep(0), dockPos(QInternal::LeftDock), o(Qt::Horizontal), mainWindow(0)
+#ifndef QT_NO_TABBAR
+    , tabbed(false), tabBar(0), tabBarShape(QTabBar::RoundedSouth), tabBarVisible(false)
 #endif
+{
 …
                                             Qt::Orientation _o, int tbshape,
                                             QMainWindow *window)
     : sep(_sep), dockPos(_dockPos), o(_o), rect(0, 0, -1, -1), mainWindow(window)
 #ifndef QT_NO_TABBAR
     , tabbed(false), tabBar(0), tabBarShape(static_cast<QTabBar::Shape>(tbshape))
+    : sep(_sep), dockPos(_dockPos), o(_o), mainWindow(window)
+#ifndef QT_NO_TABBAR
+    , tabbed(false), tabBar(0), tabBarShape(static_cast<QTabBar::Shape>(tbshape)), tabBarVisible(false)
 #endif
+{
 …
+{
     item_list.clear();
     rect = QRect(0, 0, -1, -1);
+    rect = QRect();
 #ifndef QT_NO_TABBAR
     tabbed = false;
 …
     int a = 0, b = 0;
-    bool prev_gap = false;
-    bool first = true;
     int min_perp = 0;
     int max_perp = QWIDGETSIZE_MAX;
+    const QDockAreaLayoutItem *previous = 0;
     for (int i = 0; i < item_list.size(); ++i) {
         const QDockAreaLayoutItem &item = item_list.at(i);
 …
 #endif
+        {
+            if (!first && !gap && !prev_gap)
+            if (previous && !gap && !(previous->flags &  QDockAreaLayoutItem::GapItem)
+                && !previous->hasFixedSize(o)) {
                 a += sep;
+            }
             a += gap ? item.size : pick(o, size_hint);
+        }
         b = qMax(b, perp(o, size_hint));
+        prev_gap = gap;
+        first = false;
+        previous = &item;
+    }
 …
     int last_index = -1;
+    bool prev_gap = false;
+    bool first = true;
+    const QDockAreaLayoutItem *previous = 0;
     for (int i = 0; i < item_list.size(); ++i) {
         QDockAreaLayoutItem &item = item_list[i];
 …
         bool gap = item.flags & QDockAreaLayoutItem::GapItem;
         if (!first && !gap && !prev_gap) {
             QLayoutStruct &ls = layout_struct_list[j++];
             ls.init();
             ls.minimumSize = sep;
             ls.maximumSize = sep;
             ls.sizeHint = sep;
             ls.empty = false;
+        if (previous && !gap) {
+            if (!(previous->flags & QDockAreaLayoutItem::GapItem)) {
+                QLayoutStruct &ls = layout_struct_list[j++];
+                ls.init();
+                ls.minimumSize = ls.maximumSize = ls.sizeHint = previous->hasFixedSize(o) ? 0 : sep;
+                ls.empty = false;
+            }
+        }
 …
         item.flags &= ~QDockAreaLayoutItem::KeepSize;
+        prev_gap = gap;
+        first = false;
+        previous = &item;
+    }
     layout_struct_list.resize(j);
 …
     j = 0;
     prev_gap = false;
     first = true;
+    bool prev_gap = false;
+    bool first = true;
     for (int i = 0; i < item_list.size(); ++i) {
         QDockAreaLayoutItem &item = item_list[i];
 …
+}
 int QDockAreaLayoutInfo::separatorMove(int index, int delta, QVector<QLayoutStruct> *cache)
+int QDockAreaLayoutInfo::separatorMove(int index, int delta)
+{
 #ifndef QT_NO_TABBAR
 …
 #endif
+    if (cache->isEmpty()) {
+        QVector<QLayoutStruct> &list = *cache;
+        list.resize(item_list.size());
+        for (int i = 0; i < item_list.size(); ++i) {
+            const QDockAreaLayoutItem &item = item_list.at(i);
+            QLayoutStruct &ls = list[i];
+            Q_ASSERT(!(item.flags & QDockAreaLayoutItem::GapItem));
+            if (item.skip()) {
+                ls.empty = true;
+            } else {
+                ls.empty = false;
+                ls.pos = item.pos;
+                ls.size = item.size;
+                ls.minimumSize = pick(o, item.minimumSize());
+                ls.maximumSize = pick(o, item.maximumSize());
+            }
+        }
+    }
+    QVector<QLayoutStruct> list = *cache;
+    delta = separatorMoveHelper(list, index, delta, sep);
+    for (int i = 0; i < item_list.size(); ++i) {
+    QVector<QLayoutStruct> list(item_list.size());
+    for (int i = 0; i < list.size(); ++i) {
+        const QDockAreaLayoutItem &item = item_list.at(i);
+        QLayoutStruct &ls = list[i];
+        Q_ASSERT(!(item.flags & QDockAreaLayoutItem::GapItem));
+        if (item.skip()) {
+            ls.empty = true;
+        } else {
+            const int separatorSpace = item.hasFixedSize(o) ? 0 : sep;
+            ls.empty = false;
+            ls.pos = item.pos;
+            ls.size = item.size + separatorSpace;
+            ls.minimumSize = pick(o, item.minimumSize()) + separatorSpace;
+            ls.maximumSize = pick(o, item.maximumSize()) + separatorSpace;
+        }
+    }
+    //the separator space has been added to the size, so we pass 0 as a parameter
+    delta = separatorMoveHelper(list, index, delta, 0 /*separator*/);
+    for (int i = 0; i < list.size(); ++i) {
         QDockAreaLayoutItem &item = item_list[i];
         if (item.skip())
             continue;
         QLayoutStruct &ls = list[i];
+        item.size = ls.size;
+        const int separatorSpace = item.hasFixedSize(o) ? 0 : sep;
+        item.size = ls.size - separatorSpace;
         item.pos = ls.pos;
         if (item.subinfo != 0) {
             item.subinfo->rect = itemRect(i);
 …
+}
 void QDockAreaLayoutInfo::remove(QList<int> path)
+void QDockAreaLayoutInfo::remove(const QList<int> &path)
+{
     Q_ASSERT(!path.isEmpty());
     if (path.count() > 1) {
         int index = path.takeFirst();
+        const int index = path.first();
         QDockAreaLayoutItem &item = item_list[index];
         Q_ASSERT(item.subinfo != 0);
         item.subinfo->remove(path);
+        item.subinfo->remove(path.mid(1));
         unnest(index);
     } else {
 …
+}
 QLayoutItem *QDockAreaLayoutInfo::plug(QList<int> path)
+QLayoutItem *QDockAreaLayoutInfo::plug(const QList<int> &path)
+{
     Q_ASSERT(!path.isEmpty());
     int index = path.takeFirst();
+    int index = path.first();
     if (index < 0)
         index = -index - 1;
     if (!path.isEmpty()) {
+    if (path.count() > 1) {
         const QDockAreaLayoutItem &item = item_list.at(index);
         Q_ASSERT(item.subinfo != 0);
         return item.subinfo->plug(path);
+        return item.subinfo->plug(path.mid(1));
+    }
 …
+}
 QLayoutItem *QDockAreaLayoutInfo::unplug(QList<int> path)
+QLayoutItem *QDockAreaLayoutInfo::unplug(const QList<int> &path)
+{
     Q_ASSERT(!path.isEmpty());
+    const int index = path.first();
     if (path.count() > 1) {
-        int index = path.takeFirst();
         const QDockAreaLayoutItem &item = item_list.at(index);
         Q_ASSERT(item.subinfo != 0);
+        return item.subinfo->unplug(path);
+    }
+    int index = path.first();
+        return item.subinfo->unplug(path.mid(1));
+    }
     QDockAreaLayoutItem &item = item_list[index];
     int prev = this->prev(index);
 …
+}
 bool QDockAreaLayoutInfo::insertGap(QList<int> path, QLayoutItem *dockWidgetItem)
+bool QDockAreaLayoutInfo::insertGap(const QList<int> &path, QLayoutItem *dockWidgetItem)
+{
     Q_ASSERT(!path.isEmpty());
     bool insert_tabbed = false;
     int index = path.takeFirst();
+    int index = path.first();
     if (index < 0) {
         insert_tabbed = true;
 …
 //    dump(qDebug() << "insertGap() before:" << index << tabIndex, *this, QString());
     if (!path.isEmpty()) {
+    if (path.count() > 1) {
         QDockAreaLayoutItem &item = item_list[index];
 …
             QDockAreaLayoutInfo *subinfo = item.subinfo;
             QLayoutItem *widgetItem = item.widgetItem;
+            QRect r = subinfo == 0 ? dockedGeometry(widgetItem->widget()) : subinfo->rect;
+            QPlaceHolderItem *placeHolderItem = item.placeHolderItem;
+            QRect r = subinfo == 0 ? widgetItem ? dockedGeometry(widgetItem->widget()) : placeHolderItem->topLevelRect : subinfo->rect;
             Qt::Orientation opposite = o == Qt::Horizontal ? Qt::Vertical : Qt::Horizontal;
 …
                 = new QDockAreaLayoutInfo(sep, dockPos, opposite, tabBarShape, mainWindow);
+            //item become a new top-level
             item.subinfo = new_info;
             item.widgetItem = 0;
+            item.placeHolderItem = 0;
             QDockAreaLayoutItem new_item
                 = widgetItem == 0
                     ? QDockAreaLayoutItem(subinfo)
                     : QDockAreaLayoutItem(widgetItem);
+                    : widgetItem ? QDockAreaLayoutItem(widgetItem) : QDockAreaLayoutItem(placeHolderItem);
             new_item.size = pick(opposite, r.size());
             new_item.pos = pick(opposite, r.topLeft());
 …
+        }
+        bool result = item.subinfo->insertGap(path, dockWidgetItem);
+        return result;
+        return item.subinfo->insertGap(path.mid(1), dockWidgetItem);
+    }
 …
+}
 QDockAreaLayoutInfo *QDockAreaLayoutInfo::info(QList<int> path)
+{
     int index = path.takeFirst();
+QDockAreaLayoutInfo *QDockAreaLayoutInfo::info(const QList<int> &path)
+{
+    int index = path.first();
     if (index < 0)
         index = -index - 1;
     if (index >= item_list.count())
         return this;
     if (path.isEmpty() || item_list.at(index).subinfo == 0)
+    if (path.count() == 1 || item_list[index].subinfo == 0)
         return this;
     return item_list.at(index).subinfo->info(path);
+    return item_list[index].subinfo->info(path.mid(1));
+}
 …
+}
 QRect QDockAreaLayoutInfo::itemRect(QList<int> path) const
+QRect QDockAreaLayoutInfo::itemRect(const QList<int> &path) const
+{
     Q_ASSERT(!path.isEmpty());
+    const int index = path.first();
     if (path.count() > 1) {
         const QDockAreaLayoutItem &item = item_list.at(path.takeFirst());
+        const QDockAreaLayoutItem &item = item_list.at(index);
         Q_ASSERT(item.subinfo != 0);
         return item.subinfo->itemRect(path);
+    }
     return itemRect(path.first());
+        return item.subinfo->itemRect(path.mid(1));
+    }
+    return itemRect(index);
+}
 …
+}
 QRect QDockAreaLayoutInfo::separatorRect(QList<int> path) const
+QRect QDockAreaLayoutInfo::separatorRect(const QList<int> &path) const
+{
     Q_ASSERT(!path.isEmpty());
+    const int index = path.first();
     if (path.count() > 1) {
         const QDockAreaLayoutItem &item = item_list.at(path.takeFirst());
+        const QDockAreaLayoutItem &item = item_list.at(index);
         Q_ASSERT(item.subinfo != 0);
         return item.subinfo->separatorRect(path);
+    }
     return separatorRect(path.first());
+        return item.subinfo->separatorRect(path.mid(1));
+    }
+    return separatorRect(index);
+}
 …
             continue;
+        int margin = (sep == 1? 2 : 0);
+        if (pos >= item.pos + item.size - margin && item.pos + item.size + sep + margin > pos) {
+            QList<int> result;
+            result.append(i);
+            return result;
+        QRect sepRect = separatorRect(i);
+        if (!sepRect.isNull() && sep == 1)
+            sepRect.adjust(-2, -2, 2, 2);
+        //we also make sure we don't find a separator that's not there
+        if (sepRect.contains(_pos) && !item.hasFixedSize(o)) {
+            return QList<int>() << i;
+        }
 …
+}
+bool QDockAreaLayoutInfo::hasFixedSize() const
+{
+    return perp(o, minimumSize()) == perp(o, maximumSize());
+}
 void QDockAreaLayoutInfo::apply(bool animate)
+{
     QWidgetAnimator *widgetAnimator = mainWindowLayout()->widgetAnimator;
+    QWidgetAnimator &widgetAnimator = mainWindowLayout()->widgetAnimator;
 #ifndef QT_NO_TABBAR
 …
+        }
         widgetAnimator->animate(tabBar, tab_rect, animate);
+        widgetAnimator.animate(tabBar, tab_rect, animate);
+    }
 #endif // QT_NO_TABBAR
 …
         QRect geo = w->geometry();
         widgetAnimator->animate(w, r, animate);
         if (!w->isHidden()) {
+        widgetAnimator.animate(w, r, animate);
+        if (!w->isHidden() && w->window()->isVisible()) {
             QDockWidget *dw = qobject_cast<QDockWidget*>(w);
             if (!r.isValid() && geo.right() >= 0 && geo.bottom() >= 0) {
 …
+        }
+    }
+#ifndef QT_NO_TABBAR
     if (sep == 1)
         updateSeparatorWidgets();
+#endif //QT_NO_TABBAR
+}
 …
             break;
         QRect r = separatorRect(i);
         if (clip.contains(r))
+        if (clip.contains(r) && !item.hasFixedSize(o))
             paintSep(p, widget, r, o, r.contains(mouse));
+    }
 …
+}
 QDockAreaLayoutItem &QDockAreaLayoutInfo::item(QList<int> path)
+QDockAreaLayoutItem &QDockAreaLayoutInfo::item(const QList<int> &path)
+{
     Q_ASSERT(!path.isEmpty());
+    const int index = path.first();
     if (path.count() > 1) {
         QDockAreaLayoutItem &item = item_list[path.takeFirst()];
+        const QDockAreaLayoutItem &item = item_list[index];
         Q_ASSERT(item.subinfo != 0);
         return item.subinfo->item(path);
+    }
     return item_list[path.first()];
+        return item.subinfo->item(path.mid(1));
+    }
+    return item_list[index];
+}
 …
+}
-#ifdef Q_WS_MAC
 static Qt::DockWidgetArea toDockWidgetArea(QInternal::DockPosition pos)
+{
 …
     return Qt::NoDockWidgetArea;
+}
-#endif
 static QRect constrainedRect(QRect rect, const QRect &desktop)
 …
                     if (!testing) {
                         widget->setVisible(flags & StateFlagVisible);
+                        item_list.append(item);
+                    }
                 } else {
                     int dummy;
                     stream >> item.pos >> item.size >> dummy >> dummy;
-    //                qDebug() << widget << item.pos << item.size;
                     if (!testing) {
+                        item_list.append(item);
                         widget->setFloating(false);
                         widget->setVisible(flags & StateFlagVisible);
+                        emit widget->dockLocationChanged(toDockWidgetArea(dockPos));
+                    }
+                }
-                if (!testing) {
-                    item_list.append(item);
+                }
+            }
         } else if (nextMarker == SequenceMarker) {
 …
         setCurrentTabId(tabId(item_list.at(index)));
+    }
-#endif
     if (!testing && sep == 1)
         updateSeparatorWidgets();
+#endif
     return true;
+}
+#ifndef QT_NO_TABBAR
 void QDockAreaLayoutInfo::updateSeparatorWidgets() const
+{
-    QDockAreaLayoutInfo *that = const_cast<QDockAreaLayoutInfo*>(this);
     if (tabbed) {
         that->separatorWidgets.clear();
+        separatorWidgets.clear();
         return;
+    }
 …
         } else {
             sepWidget = mainWindowLayout()->getSeparatorWidget();
             that->separatorWidgets.append(sepWidget);
+            separatorWidgets.append(sepWidget);
+        }
         j++;
 …
+    }
     for (int k = j; k < that->separatorWidgets.size(); ++k) {
         that->separatorWidgets[k]->hide();
+    }
     that->separatorWidgets.resize(j);
+    for (int k = j; k < separatorWidgets.size(); ++k) {
+        separatorWidgets[k]->hide();
+    }
+    separatorWidgets.resize(j);
     Q_ASSERT(separatorWidgets.size() == j);
+}
+#endif //QT_NO_TABBAR
 #ifndef QT_NO_TABBAR
 …
     QDockAreaLayoutInfo *that = const_cast<QDockAreaLayoutInfo*>(this);
     if (tabBar == 0) {
+    if (that->tabBar == 0) {
         that->tabBar = mainWindowLayout()->getTabBar();
         that->tabBar->setShape(static_cast<QTabBar::Shape>(tabBarShape));
 …
     QSet<QWidget*> result;
     foreach (QWidget *sepWidget, separatorWidgets)
         result << sepWidget;
+    for (int i = 0; i < separatorWidgets.count(); ++i)
+        result << separatorWidgets.at(i);
     for (int i = 0; i < item_list.count(); ++i) {
 …
 */
 QDockAreaLayout::QDockAreaLayout(QMainWindow *win)
+QDockAreaLayout::QDockAreaLayout(QMainWindow *win) : fallbackToSizeHints(true)
+{
     mainWindow = win;
 …
         = QDockAreaLayoutInfo(sep, QInternal::BottomDock, Qt::Horizontal, tabShape, win);
     centralWidgetItem = 0;
+    centralWidgetRect = QRect(0, 0, -1, -1);
     corners[Qt::TopLeftCorner] = Qt::TopDockWidgetArea;
 …
                 corners[i] = static_cast<Qt::DockWidgetArea>(cornerData[i]);
+        }
+        if (!testing)
+            fallbackToSizeHints = false;
+    }
 …
             continue;
         QRect rect = separatorRect(i);
         if (sep == 1)
+        if (!rect.isNull() && sep == 1)
             rect.adjust(-2, -2, 2, 2);
         if (rect.contains(pos)) {
+        if (rect.contains(pos) && !info.hasFixedSize()) {
             result << i;
             break;
 …
+}
 QDockAreaLayoutInfo *QDockAreaLayout::info(QList<int> path)
+QDockAreaLayoutInfo *QDockAreaLayout::info(const QList<int> &path)
+{
     Q_ASSERT(!path.isEmpty());
     int index = path.takeFirst();
+    const int index = path.first();
     Q_ASSERT(index >= 0 && index < QInternal::DockCount);
     if (path.isEmpty())
+    if (path.count() == 1)
         return &docks[index];
     return docks[index].info(path);
+}
 const QDockAreaLayoutInfo *QDockAreaLayout::info(QList<int> path) const
+    return docks[index].info(path.mid(1));
+}
+const QDockAreaLayoutInfo *QDockAreaLayout::info(const QList<int> &path) const
+{
     return const_cast<QDockAreaLayout*>(this)->info(path);
+}
 QDockAreaLayoutItem &QDockAreaLayout::item(QList<int> path)
+QDockAreaLayoutItem &QDockAreaLayout::item(const QList<int> &path)
+{
     Q_ASSERT(!path.isEmpty());
     int index = path.takeFirst();
+    const int index = path.first();
     Q_ASSERT(index >= 0 && index < QInternal::DockCount);
     return docks[index].item(path);
+}
 QRect QDockAreaLayout::itemRect(QList<int> path) const
+    return docks[index].item(path.mid(1));
+}
+QRect QDockAreaLayout::itemRect(const QList<int> &path) const
+{
     Q_ASSERT(!path.isEmpty());
     int index = path.takeFirst();
+    const int index = path.first();
     Q_ASSERT(index >= 0 && index < QInternal::DockCount);
     return docks[index].itemRect(path);
+    return docks[index].itemRect(path.mid(1));
+}
 QRect QDockAreaLayout::separatorRect(int index) const
+{
+    if (docks[index].isEmpty())
+    const QDockAreaLayoutInfo &dock = docks[index];
+    if (dock.isEmpty())
         return QRect();
     QRect r = docks[index].rect;
+    QRect r = dock.rect;
     switch (index) {
         case QInternal::LeftDock:
 …
+}
 QRect QDockAreaLayout::separatorRect(QList<int> path) const
+QRect QDockAreaLayout::separatorRect(const QList<int> &path) const
+{
     Q_ASSERT(!path.isEmpty());
     int index = path.takeFirst();
+    const int index = path.first();
     Q_ASSERT(index >= 0 && index < QInternal::DockCount);
     if (path.isEmpty())
+    if (path.count() == 1)
         return separatorRect(index);
     else
         return docks[index].separatorRect(path);
+}
 bool QDockAreaLayout::insertGap(QList<int> path, QLayoutItem *dockWidgetItem)
+        return docks[index].separatorRect(path.mid(1));
+}
+bool QDockAreaLayout::insertGap(const QList<int> &path, QLayoutItem *dockWidgetItem)
+{
     Q_ASSERT(!path.isEmpty());
     int index = path.takeFirst();
+    const int index = path.first();
     Q_ASSERT(index >= 0 && index < QInternal::DockCount);
     return docks[index].insertGap(path, dockWidgetItem);
+}
 QLayoutItem *QDockAreaLayout::plug(QList<int> path)
+    return docks[index].insertGap(path.mid(1), dockWidgetItem);
+}
+QLayoutItem *QDockAreaLayout::plug(const QList<int> &path)
+{
     Q_ASSERT(!path.isEmpty());
     int index = path.takeFirst();
+    const int index = path.first();
     Q_ASSERT(index >= 0 && index < QInternal::DockCount);
     return docks[index].plug(path);
+}
 QLayoutItem *QDockAreaLayout::unplug(QList<int> path)
+    return docks[index].plug(path.mid(1));
+}
+QLayoutItem *QDockAreaLayout::unplug(const QList<int> &path)
+{
     Q_ASSERT(!path.isEmpty());
     int index = path.takeFirst();
+    const int index = path.first();
     Q_ASSERT(index >= 0 && index < QInternal::DockCount);
     return docks[index].unplug(path);
+}
 void QDockAreaLayout::remove(QList<int> path)
+    return docks[index].unplug(path.mid(1));
+}
+void QDockAreaLayout::remove(const QList<int> &path)
+{
     Q_ASSERT(!path.isEmpty());
     int index = path.takeFirst();
+    const int index = path.first();
     Q_ASSERT(index >= 0 && index < QInternal::DockCount);
     docks[index].remove(path);
+    docks[index].remove(path.mid(1));
+}
 …
     QSize center_hint(0, 0);
     QSize center_min(0, 0);
     bool have_central = centralWidgetItem != 0 && !centralWidgetItem->isEmpty();
+    const bool have_central = centralWidgetItem != 0 && !centralWidgetItem->isEmpty();
     if (have_central) {
         center_hint = centralWidgetRect.size();
 …
     QSize left_hint = docks[QInternal::LeftDock].size();
     if (!left_hint.isValid())
+    if (left_hint.isNull() || fallbackToSizeHints)
         left_hint = docks[QInternal::LeftDock].sizeHint();
     QSize left_min = docks[QInternal::LeftDock].minimumSize();
 …
     QSize right_hint = docks[QInternal::RightDock].size();
     if (!right_hint.isValid())
+    if (right_hint.isNull() || fallbackToSizeHints)
         right_hint = docks[QInternal::RightDock].sizeHint();
     QSize right_min = docks[QInternal::RightDock].minimumSize();
 …
     QSize top_hint = docks[QInternal::TopDock].size();
     if (!top_hint.isValid())
+    if (top_hint.isNull() || fallbackToSizeHints)
         top_hint = docks[QInternal::TopDock].sizeHint();
     QSize top_min = docks[QInternal::TopDock].minimumSize();
 …
     QSize bottom_hint = docks[QInternal::BottomDock].size();
     if (!bottom_hint.isValid())
+    if (bottom_hint.isNull() || fallbackToSizeHints)
         bottom_hint = docks[QInternal::BottomDock].sizeHint();
     QSize bottom_min = docks[QInternal::BottomDock].minimumSize();
     QSize bottom_max = docks[QInternal::BottomDock].maximumSize();
     bottom_hint = bottom_hint.boundedTo(bottom_max).expandedTo(bottom_min);
+    fallbackToSizeHints = !have_central;
     if (_ver_struct_list != 0) {
 …
         docks[i].clear();
     rect = QRect(0, 0, -1, -1);
     centralWidgetRect = QRect(0, 0, -1, -1);
+    rect = QRect();
+    centralWidgetRect = QRect();
+}
 …
 void QDockAreaLayout::apply(bool animate)
+{
     QWidgetAnimator *widgetAnimator
+    QWidgetAnimator &widgetAnimator
         = qobject_cast<QMainWindowLayout*>(mainWindow->layout())->widgetAnimator;
 …
         docks[i].apply(animate);
     if (centralWidgetItem != 0 && !centralWidgetItem->isEmpty()) {
         widgetAnimator->animate(centralWidgetItem->widget(), centralWidgetRect,
+        widgetAnimator.animate(centralWidgetItem->widget(), centralWidgetRect,
                                 animate);
+    }
+#ifndef QT_NO_TABBAR
     if (sep == 1)
         updateSeparatorWidgets();
+#endif //QT_NO_TABBAR
+}
 …
             continue;
         QRect r = separatorRect(i);
         if (clip.contains(r)) {
+        if (clip.contains(r) && !dock.hasFixedSize()) {
             Qt::Orientation opposite = dock.o == Qt::Horizontal
                                         ? Qt::Vertical : Qt::Horizontal;
 …
+}
+int QDockAreaLayout::separatorMove(QList<int> separator, const QPoint &origin,
+                                                const QPoint &dest,
+                                                QVector<QLayoutStruct> *cache)
+int QDockAreaLayout::separatorMove(const QList<int> &separator, const QPoint &origin,
+                                                const QPoint &dest)
+{
     int delta = 0;
 …
         delta = pick(info->o, dest - origin);
         if (delta != 0)
             delta = info->separatorMove(index, delta, cache);
+            delta = info->separatorMove(index, delta);
         info->apply(false);
         return delta;
+    }
+    if (cache->isEmpty()) {
+        QVector<QLayoutStruct> &list = *cache;
+        if (index == QInternal::LeftDock || index == QInternal::RightDock)
+            getGrid(0, &list);
+        else
+            getGrid(&list, 0);
+    }
+    QVector<QLayoutStruct> list = *cache;
+    QVector<QLayoutStruct> list;
+    if (index == QInternal::LeftDock || index == QInternal::RightDock)
+        getGrid(0, &list);
+    else
+        getGrid(&list, 0);
     int sep_index = index == QInternal::LeftDock || index == QInternal::TopDock
                         ? 0 : 1;
 …
+}
+#ifndef QT_NO_TABBAR
 // Sets the correct positions for the seperator widgets
 // Allocates new sepearator widgets with getSeparatorWidget
 void QDockAreaLayout::updateSeparatorWidgets() const
+{
-    QDockAreaLayout *that = const_cast<QDockAreaLayout*>(this);
     int j = 0;
 …
         } else {
             sepWidget = qobject_cast<QMainWindowLayout*>(mainWindow->layout())->getSeparatorWidget();
             that->separatorWidgets.append(sepWidget);
+            separatorWidgets.append(sepWidget);
+        }
         j++;
 …
         separatorWidgets.at(i)->hide();
+    that->separatorWidgets.resize(j);
+}
+    separatorWidgets.resize(j);
+}
+#endif //QT_NO_TABBAR
 QLayoutItem *QDockAreaLayout::itemAt(int *x, int index) const
 …
     return result;
+}
-#endif
 // Returns the set of all used separator widgets
 …
     QSet<QWidget*> result;
     foreach (QWidget *sepWidget, separatorWidgets)
         result << sepWidget;
+    for (int i = 0; i < separatorWidgets.count(); ++i)
+        result << separatorWidgets.at(i);
     for (int i = 0; i < QInternal::DockCount; ++i) {
         const QDockAreaLayoutInfo &dock = docks[i];
 …
     return result;
+}
+QRect QDockAreaLayout::gapRect(QList<int> path) const
+#endif
+QRect QDockAreaLayout::gapRect(const QList<int> &path) const
+{
     const QDockAreaLayoutInfo *info = this->info(path);

trunk/src/gui/widgets/qdockarealayout_p.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     QSize sizeHint() const;
     bool expansive(Qt::Orientation o) const;
+    bool hasFixedSize(Qt::Orientation o) const;
     QLayoutItem *widgetItem;
 …
     QSize size() const;
     bool insertGap(QList<int> path, QLayoutItem *dockWidgetItem);
     QLayoutItem *plug(QList<int> path);
     QLayoutItem *unplug(QList<int> path);
+    bool insertGap(const QList<int> &path, QLayoutItem *dockWidgetItem);
+    QLayoutItem *plug(const QList<int> &path);
+    QLayoutItem *unplug(const QList<int> &path);
     enum TabMode { NoTabs, AllowTabs, ForceTabs };
     QList<int> gapIndex(const QPoint &pos, bool nestingEnabled,
                             TabMode tabMode) const;
     void remove(QList<int> path);
+    void remove(const QList<int> &path);
     void unnest(int index);
     void split(int index, Qt::Orientation orientation, QLayoutItem *dockWidgetItem);
     void tab(int index, QLayoutItem *dockWidgetItem);
     QDockAreaLayoutItem &item(QList<int> path);
     QDockAreaLayoutInfo *info(QList<int> path);
+    QDockAreaLayoutItem &item(const QList<int> &path);
+    QDockAreaLayoutInfo *info(const QList<int> &path);
     QDockAreaLayoutInfo *info(QWidget *widget);
 …
     int changeSize(int index, int size, bool below);
     QRect itemRect(int index) const;
     QRect itemRect(QList<int> path) const;
+    QRect itemRect(const QList<int> &path) const;
     QRect separatorRect(int index) const;
     QRect separatorRect(QList<int> path) const;
+    QRect separatorRect(const QList<int> &path) const;
     void clear();
     bool isEmpty() const;
+    bool hasFixedSize() const;
     QList<int> findSeparator(const QPoint &pos) const;
     int next(int idx) const;
 …
                             const QPoint &mouse) const;
     QRegion separatorRegion() const;
     int separatorMove(int index, int delta, QVector<QLayoutStruct> *cache);
+    int separatorMove(int index, int delta);
     QLayoutItem *itemAt(int *x, int index) const;
 …
     int sep;
     QVector<QWidget*> separatorWidgets;
+    mutable QVector<QWidget*> separatorWidgets;
     QInternal::DockPosition dockPos;
     Qt::Orientation o;
 …
     QMainWindow *mainWindow;
     QList<QDockAreaLayoutItem> item_list;
+#ifndef QT_NO_TABBAR
     void updateSeparatorWidgets() const;
     QSet<QWidget*> usedSeparatorWidgets() const;
+#endif //QT_NO_TABBAR
 #ifndef QT_NO_TABBAR
 …
     QDockAreaLayoutInfo docks[4];
     int sep; // separator extent
+    QVector<QWidget*> separatorWidgets;
+    bool fallbackToSizeHints; //determines if we should use the sizehint for the dock areas (true until the layout is restored or the central widget is set)
+    mutable QVector<QWidget*> separatorWidgets;
     bool isValid() const;
 …
     QList<int> findSeparator(const QPoint &pos) const;
     QDockAreaLayoutItem &item(QList<int> path);
     QDockAreaLayoutInfo *info(QList<int> path);
     const QDockAreaLayoutInfo *info(QList<int> path) const;
+    QDockAreaLayoutItem &item(const QList<int> &path);
+    QDockAreaLayoutInfo *info(const QList<int> &path);
+    const QDockAreaLayoutInfo *info(const QList<int> &path) const;
     QDockAreaLayoutInfo *info(QWidget *widget);
     QRect itemRect(QList<int> path) const;
+    QRect itemRect(const QList<int> &path) const;
     QRect separatorRect(int index) const;
     QRect separatorRect(QList<int> path) const;
     bool insertGap(QList<int> path, QLayoutItem *dockWidgetItem);
     QLayoutItem *plug(QList<int> path);
     QLayoutItem *unplug(QList<int> path);
     void remove(QList<int> path);
+    QRect separatorRect(const QList<int> &path) const;
+    bool insertGap(const QList<int> &path, QLayoutItem *dockWidgetItem);
+    QLayoutItem *plug(const QList<int> &path);
+    QLayoutItem *unplug(const QList<int> &path);
+    void remove(const QList<int> &path);
     void fitLayout();
 …
                             const QPoint &mouse) const;
     QRegion separatorRegion() const;
     int separatorMove(QList<int> separator, const QPoint &origin, const QPoint &dest,
+                        QVector<QLayoutStruct> *cache);
+    int separatorMove(const QList<int> &separator, const QPoint &origin, const QPoint &dest);
+#ifndef QT_NO_TABBAR
     void updateSeparatorWidgets() const;
+#endif //QT_NO_TABBAR
     QLayoutItem *itemAt(int *x, int index) const;
 …
                     QVector<QLayoutStruct> *hor_struct_list);
     QRect gapRect(QList<int> path) const;
+    QRect gapRect(const QList<int> &path) const;
     void keepSize(QDockWidget *w);
+#ifndef QT_NO_TABBAR
     QSet<QTabBar*> usedTabBars() const;
     QSet<QWidget*> usedSeparatorWidgets() const;
+#endif //QT_NO_TABBAR
 };

trunk/src/gui/widgets/qdockwidget.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #include "qmainwindowlayout_p.h"
 #ifdef Q_WS_MAC
+#include <private/qapplication_p.h>
 #include <private/qt_mac_p.h>
 #include <qmacstyle_mac.h>
 …
 extern QString qt_setWindowTitle_helperHelper(const QString&, const QWidget*); // qwidget.cpp
+extern QHash<QByteArray, QFont> *qt_app_fonts_hash(); // qapplication.cpp
+static inline bool hasFeature(const QDockWidgetPrivate *priv, QDockWidget::DockWidgetFeature feature)
+{ return (priv->features & feature) == feature; }
 static inline bool hasFeature(const QDockWidget *dockwidget, QDockWidget::DockWidgetFeature feature)
 …
 bool QDockWidgetLayout::nativeWindowDeco(bool floating) const
+{
 #if defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_WINCE)
+#if defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_WS_WINCE)
     Q_UNUSED(floating);
     return false;
 …
+{
     int cnt = 0;
+    foreach (QLayoutItem *item, item_list) {
+    for (int i = 0; i < item_list.count(); ++i) {
+        QLayoutItem *item = item_list.at(i);
         if (item == 0)
             continue;
 …
+{
     int result = 0;
     foreach (QLayoutItem *item, item_list) {
         if (item != 0)
+    for (int i = 0; i < item_list.count(); ++i) {
+        if (item_list.at(i))
             ++result;
+    }
 …
     int mw = q->style()->pixelMetric(QStyle::PM_DockWidgetTitleMargin, 0, q);
     return qMax(buttonHeight + 2, titleFontMetrics.lineSpacing() + 2*mw);
+    return qMax(buttonHeight + 2, titleFontMetrics.height() + 2*mw);
+}
 …
+{
     Q_Q(QDockWidget);
     QDockWidgetLayout *layout = qobject_cast<QDockWidgetLayout*>(q->layout());
+    QDockWidgetLayout *dwLayout = qobject_cast<QDockWidgetLayout*>(layout);
     QStyleOptionDockWidget opt;
     q->initStyleOption(&opt);
     bool customTitleBar = layout->widgetForRole(QDockWidgetLayout::TitleBar) != 0;
     bool nativeDeco = layout->nativeWindowDeco();
+    bool customTitleBar = dwLayout->widgetForRole(QDockWidgetLayout::TitleBar) != 0;
+    bool nativeDeco = dwLayout->nativeWindowDeco();
     bool hideButtons = nativeDeco || customTitleBar;
     bool canClose = hasFeature(q, QDockWidget::DockWidgetClosable);
     bool canFloat = hasFeature(q, QDockWidget::DockWidgetFloatable);
+    bool canClose = hasFeature(this, QDockWidget::DockWidgetClosable);
+    bool canFloat = hasFeature(this, QDockWidget::DockWidgetFloatable);
     QAbstractButton *button
         = qobject_cast<QAbstractButton*>(layout->widgetForRole(QDockWidgetLayout::FloatButton));
+        = qobject_cast<QAbstractButton*>(dwLayout->widgetForRole(QDockWidgetLayout::FloatButton));
     button->setIcon(q->style()->standardIcon(QStyle::SP_TitleBarNormalButton, &opt, q));
     button->setVisible(canFloat && !hideButtons);
     button
         = qobject_cast <QAbstractButton*>(layout->widgetForRole(QDockWidgetLayout::CloseButton));
+        = qobject_cast <QAbstractButton*>(dwLayout->widgetForRole(QDockWidgetLayout::CloseButton));
     button->setIcon(q->style()->standardIcon(QStyle::SP_TitleBarCloseButton, &opt, q));
     button->setVisible(canClose && !hideButtons);
 …
 void QDockWidgetPrivate::initDrag(const QPoint &pos, bool nca)
+{
-    Q_Q(QDockWidget);
     if (state != 0)
         return;
     QMainWindow *win = qobject_cast<QMainWindow*>(q->parentWidget());
+    QMainWindow *win = qobject_cast<QMainWindow*>(parent);
     Q_ASSERT(win != 0);
     QMainWindowLayout *layout = qobject_cast<QMainWindowLayout*>(win->layout());
     Q_ASSERT(layout != 0);
-    if (layout->layoutState.indexOf(q).isEmpty()) //The dock widget has not been added into the main window
-        return;
     if (layout->pluggingWidget != 0) // the main window is animating a docking operation
         return;
 …
     if (state->dragging) {
         QMainWindowLayout *layout =
+        QMainWindowLayout *mwLayout =
             qobject_cast<QMainWindowLayout *>(q->parentWidget()->layout());
         Q_ASSERT(layout != 0);
         if (abort || !layout->plug(state->widgetItem)) {
             if (hasFeature(q, QDockWidget::DockWidgetFloatable)) {
+        Q_ASSERT(mwLayout != 0);
+        if (abort || !mwLayout->plug(state->widgetItem)) {
+            if (hasFeature(this, QDockWidget::DockWidgetFloatable)) {
                 if (state->ownWidgetItem)
                     delete state->widgetItem;
                 layout->restore();
+                mwLayout->restore();
 #ifdef Q_WS_X11
                 // get rid of the X11BypassWindowManager window flag and activate the resizer
 …
 #else
                 QDockWidgetLayout *myLayout
                     = qobject_cast<QDockWidgetLayout*>(q->layout());
+                    = qobject_cast<QDockWidgetLayout*>(layout);
                 resizer->setActive(QWidgetResizeHandler::Resize,
                                     myLayout->widgetForRole(QDockWidgetLayout::TitleBar) != 0);
 …
                 q->activateWindow();
             } else {
                 layout->revert(state->widgetItem);
+                mwLayout->revert(state->widgetItem);
+            }
+        }
 …
     Q_Q(const QDockWidget);
     QMainWindow *mainWin = qobject_cast<QMainWindow*>(q->parentWidget());
+    QMainWindow *mainWin = qobject_cast<QMainWindow*>(parent);
     if (mainWin == 0)
         return false;
 …
     Q_Q(QDockWidget);
     QDockWidgetLayout *layout
         = qobject_cast<QDockWidgetLayout*>(q->layout());
     if (!layout->nativeWindowDeco()) {
         QRect titleArea = layout->titleArea();
+    QDockWidgetLayout *dwLayout
+        = qobject_cast<QDockWidgetLayout*>(layout);
+    if (!dwLayout->nativeWindowDeco()) {
+        QRect titleArea = dwLayout->titleArea();
         if (event->button() != Qt::LeftButton ||
 …
             // check if the tool window is movable... do nothing if it
             // is not (but allow moving if the window is floating)
             (!hasFeature(q, QDockWidget::DockWidgetMovable) && !q->isFloating()) ||
             qobject_cast<QMainWindow*>(q->parentWidget()) == 0 ||
+            (!hasFeature(this, QDockWidget::DockWidgetMovable) && !q->isFloating()) ||
+            qobject_cast<QMainWindow*>(parent) == 0 ||
             isAnimating() || state != 0) {
             return false;
 …
         if (state)
             state->ctrlDrag = hasFeature(q, QDockWidget::DockWidgetFloatable) && event->modifiers() & Qt::ControlModifier;
+            state->ctrlDrag = hasFeature(this, QDockWidget::DockWidgetFloatable) && event->modifiers() & Qt::ControlModifier;
         return true;
 …
 bool QDockWidgetPrivate::mouseDoubleClickEvent(QMouseEvent *event)
+{
+    Q_Q(QDockWidget);
+    QDockWidgetLayout *layout = qobject_cast<QDockWidgetLayout*>(q->layout());
+    if (!layout->nativeWindowDeco()) {
+        QRect titleArea = layout->titleArea();
+    QDockWidgetLayout *dwLayout = qobject_cast<QDockWidgetLayout*>(layout);
+    if (!dwLayout->nativeWindowDeco()) {
+        QRect titleArea = dwLayout->titleArea();
         if (event->button() == Qt::LeftButton && titleArea.contains(event->pos()) &&
             hasFeature(q, QDockWidget::DockWidgetFloatable)) {
+            hasFeature(this, QDockWidget::DockWidgetFloatable)) {
             _q_toggleTopLevel();
             return true;
 …
     QDockWidgetLayout *dwlayout
         = qobject_cast<QDockWidgetLayout*>(q->layout());
+        = qobject_cast<QDockWidgetLayout*>(layout);
     QMainWindowLayout *mwlayout
         = qobject_cast<QMainWindowLayout*>(q->parentWidget()->layout());
 …
             if (state != 0)
                 break;
             if (qobject_cast<QMainWindow*>(q->parentWidget()) == 0)
+            if (qobject_cast<QMainWindow*>(parent) == 0)
                 break;
             if (isAnimating())
 …
     QRect r = rect;
     r.moveTopLeft(q->mapToGlobal(QPoint(0, 0)));
     QDockWidgetLayout *layout = qobject_cast<QDockWidgetLayout*>(q->layout());
     if (layout->nativeWindowDeco(true))
         r.adjust(0, layout->titleHeight(), 0, 0);
+    QDockWidgetLayout *dwLayout = qobject_cast<QDockWidgetLayout*>(layout);
+    if (dwLayout->nativeWindowDeco(true))
+        r.adjust(0, dwLayout->titleHeight(), 0, 0);
     setWindowState(true, true, r);
+}
 …
+{
     Q_Q(QDockWidget);
+    if (!floating && parent) {
+        QMainWindowLayout *mwlayout = qobject_cast<QMainWindowLayout *>(q->parentWidget()->layout());
+        if (!mwlayout || mwlayout->dockWidgetArea(q) == Qt::NoDockWidgetArea)
+            return; // this dockwidget can't be redocked
+    }
     bool wasFloating = q->isFloating();
 …
     Qt::WindowFlags flags = floating ? Qt::Tool : Qt::Widget;
     QDockWidgetLayout *layout = qobject_cast<QDockWidgetLayout*>(q->layout());
     const bool nativeDeco = layout->nativeWindowDeco(floating);
+    QDockWidgetLayout *dwLayout = qobject_cast<QDockWidgetLayout*>(layout);
+    const bool nativeDeco = dwLayout->nativeWindowDeco(floating);
     if (nativeDeco) {
         flags |= Qt::CustomizeWindowHint | Qt::WindowTitleHint;
         if (hasFeature(q, QDockWidget::DockWidgetClosable))
+        if (hasFeature(this, QDockWidget::DockWidgetClosable))
             flags |= Qt::WindowCloseButtonHint;
     } else {
 …
     if (floating != wasFloating) {
         emit q->topLevelChanged(floating);
         if (!floating && q->parentWidget()) {
+        if (!floating && parent) {
             QMainWindowLayout *mwlayout = qobject_cast<QMainWindowLayout *>(q->parentWidget()->layout());
             if (mwlayout)
 …
     desktop.
     \ingroup application
+    \ingroup mainwindow-classes
     QDockWidget provides the concept of dock widgets, also know as
 …
 /*!
     \property QDockWidget::windowTitle
     \internal
+    \brief the dock widget title (caption)
     By default, this property contains an empty string.
 …
     if (d->features == features)
         return;
+    const bool closableChanged = (d->features ^ features) & DockWidgetClosable;
     d->features = features;
     QDockWidgetLayout *layout
 …
     emit featuresChanged(d->features);
     update();
+    if (closableChanged && layout->nativeWindowDeco()) {
+        //this ensures the native decoration is drawn
+        d->setWindowState(true /*floating*/, true /*unplug*/);
+    }
+}
 …
             if (QMainWindowLayout *winLayout =
                 (win ? qobject_cast<QMainWindowLayout*>(win->layout()) : 0))
+                if (QDockAreaLayoutInfo *info =
+                    (winLayout ? winLayout->layoutState.dockAreaLayout.info(this) : 0))
+                if (QDockAreaLayoutInfo *info = winLayout->layoutState.dockAreaLayout.info(this))
                     info->updateTabBar();
+        }
 …
     case QEvent::Show:
         d->toggleViewAction->setChecked(true);
         emit visibilityChanged(true);
+        emit visibilityChanged(geometry().right() >= 0 && geometry().bottom() >= 0);
         break;
 #endif

trunk/src/gui/widgets/qdockwidget.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/qdockwidget_p.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/qeffects.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 QAlphaWidget::~QAlphaWidget()
+{
 #ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) && !defined(Q_WS_WINCE)
     // Restore user-defined opacity value
     if (widget && QSysInfo::WindowsVersion >= QSysInfo::WV_2000 && QSysInfo::WindowsVersion < QSysInfo::WV_NT_based)
+    if (widget)
         widget->setWindowOpacity(windowOpacity);
 #endif
 …
     showWidget = true;
+#if defined(Q_OS_WIN)
+    if (QSysInfo::WindowsVersion >= QSysInfo::WV_2000 && QSysInfo::WindowsVersion < QSysInfo::WV_NT_based) {
+        qApp->installEventFilter(this);
+        widget->setWindowOpacity(0.0);
+        widget->show();
+#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
+    qApp->installEventFilter(this);
+    widget->setWindowOpacity(0.0);
+    widget->show();
+    connect(&anim, SIGNAL(timeout()), this, SLOT(render()));
+    anim.start(1);
+#else
+    //This is roughly equivalent to calling setVisible(true) without actually showing the widget
+    widget->setAttribute(Qt::WA_WState_ExplicitShowHide, true);
+    widget->setAttribute(Qt::WA_WState_Hidden, false);
+    qApp->installEventFilter(this);
+    move(widget->geometry().x(),widget->geometry().y());
+    resize(widget->size().width(), widget->size().height());
+    frontImage = QPixmap::grabWidget(widget).toImage();
+    backImage = QPixmap::grabWindow(QApplication::desktop()->winId(),
+                                widget->geometry().x(), widget->geometry().y(),
+                                widget->geometry().width(), widget->geometry().height()).toImage();
+    if (!backImage.isNull() && checkTime.elapsed() < duration / 2) {
+        mixedImage = backImage.copy();
+        pm = QPixmap::fromImage(mixedImage);
+        show();
+        setEnabled(false);
         connect(&anim, SIGNAL(timeout()), this, SLOT(render()));
         anim.start(1);
+    } else
+    } else {
+       duration = 0;
+       render();
+    }
 #endif
+    {
-        //This is roughly equivalent to calling setVisible(true) without actually showing the widget
-        widget->setAttribute(Qt::WA_WState_ExplicitShowHide, true);
-        widget->setAttribute(Qt::WA_WState_Hidden, false);
-        qApp->installEventFilter(this);
-        move(widget->geometry().x(),widget->geometry().y());
-        resize(widget->size().width(), widget->size().height());
-        frontImage = QPixmap::grabWidget(widget).toImage();
-        backImage = QPixmap::grabWindow(QApplication::desktop()->winId(),
-                                    widget->geometry().x(), widget->geometry().y(),
-                                    widget->geometry().width(), widget->geometry().height()).toImage();
-        if (!backImage.isNull() && checkTime.elapsed() < duration / 2) {
-            mixedImage = backImage.copy();
-            pm = QPixmap::fromImage(mixedImage);
-            show();
-            setEnabled(false);
-            connect(&anim, SIGNAL(timeout()), this, SLOT(render()));
-            anim.start(1);
-        } else {
-           duration = 0;
-           render();
+        }
+    }
+}
 …
         alpha = 1;
+#if defined(Q_OS_WIN)
+    if (QSysInfo::WindowsVersion >= QSysInfo::WV_2000 && QSysInfo::WindowsVersion < QSysInfo::WV_NT_based) {
+        if (alpha >= windowOpacity || !showWidget) {
+            anim.stop();
+            qApp->removeEventFilter(this);
+            widget->setWindowOpacity(windowOpacity);
+            q_blend = 0;
+            deleteLater();
+        } else {
+            widget->setWindowOpacity(alpha);
+        }
+    } else
+#endif
+#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
+    if (alpha >= windowOpacity || !showWidget) {
+        anim.stop();
+        qApp->removeEventFilter(this);
+        widget->setWindowOpacity(windowOpacity);
+        q_blend = 0;
+        deleteLater();
+    } else {
+        widget->setWindowOpacity(alpha);
+    }
+#else
     if (alpha >= 1 || !showWidget) {
         anim.stop();
 …
                 setEnabled(true);
                 setFocus();
 #endif
+#endif // Q_WS_WIN
                 widget->hide();
             } else {
 …
         repaint();
+    }
+#endif // defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
+}
 …
         return;
     qApp->sendPostedEvents(w, QEvent::Move);
     qApp->sendPostedEvents(w, QEvent::Resize);
+    QApplication::sendPostedEvents(w, QEvent::Move);
+    QApplication::sendPostedEvents(w, QEvent::Resize);
     Qt::WindowFlags flags = Qt::ToolTip;
 …
         return;
     qApp->sendPostedEvents(w, QEvent::Move);
     qApp->sendPostedEvents(w, QEvent::Resize);
+    QApplication::sendPostedEvents(w, QEvent::Move);
+    QApplication::sendPostedEvents(w, QEvent::Resize);
     Qt::WindowFlags flags = Qt::ToolTip;

trunk/src/gui/widgets/qeffects_p.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/qfocusframe.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     \ingroup basicwidgets
+    \mainclass
     Normally an application will not need to create its own

trunk/src/gui/widgets/qfocusframe.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/qfontcombobox.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     font.setPointSize(QFontInfo(font).pointSize() * 3/2);
     QFontMetrics fontMetrics(font);
     return QSize(fontMetrics.width(text), fontMetrics.lineSpacing());
+    return QSize(fontMetrics.width(text), fontMetrics.height());
+}
 …
     list = result;
+    //we need to block the signals so that the model doesn't emit reset
+    //this prevents the current index from changing
+    //it will be updated just after this
+    ///TODO: we should finda way to avoid blocking signals and have a real update of the model
+    const bool old = m->blockSignals(true);
     m->setStringList(list);
+    m->blockSignals(old);
     if (list.isEmpty()) {
         if (currentFont != QFont()) {
 …
+{
     Q_Q(QFontComboBox);
+    QFont newFont(text);
+    if (currentFont != newFont) {
+        currentFont = newFont;
+    if (currentFont.family() != text) {
+        currentFont.setFamily(text);
         emit q->currentFontChanged(currentFont);
+    }
 …
     \since 4.2
     \ingroup basicwidgets
-    \ingroup text
     The combobox is populated with an alphabetized list of font
 …
     if (font != d->currentFont) {
         d->currentFont = font;
-        emit currentFontChanged(d->currentFont);
         d->_q_updateModel();
+        if (d->currentFont == font) { //else the signal has already be emitted by _q_updateModel
+            emit currentFontChanged(d->currentFont);
+        }
+    }
+}

trunk/src/gui/widgets/qfontcombobox.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/qframe.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
       frameWidth(0),
       leftFrameWidth(0), rightFrameWidth(0),
+      topFrameWidth(0), bottomFrameWidth(0),
+      oldFrameStyle(QFrame::NoFrame | QFrame::Plain)
+      topFrameWidth(0), bottomFrameWidth(0)
+{
+}
 …
     \ingroup abstractwidgets
+    \mainclass
     QMenu uses this to "raise" the menu above the surrounding
 …
     (useful as separator)
     \value WinPanel draws a rectangular panel that can be raised or
     sunken like those in Windows 95. Specifying this shape sets
+    sunken like those in Windows 2000. Specifying this shape sets
     the line width to 2 pixels. WinPanel is provided for compatibility.
     For GUI style independence we recommend using StyledPanel instead.
 …
     update();
     d->updateFrameWidth();
-    d->oldFrameStyle = (short)style;
+}

trunk/src/gui/widgets/qframe.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/qframe_p.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 QT_BEGIN_NAMESPACE
 class Q_GUI_EXPORT QFramePrivate : public QWidgetPrivate
+class QFramePrivate : public QWidgetPrivate
+{
     Q_DECLARE_PUBLIC(QFrame)
 …
     short       leftFrameWidth, rightFrameWidth;
     short       topFrameWidth, bottomFrameWidth;
-    short       oldFrameStyle;
     inline void init();

trunk/src/gui/widgets/qgroupbox.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     \ingroup organizers
     \ingroup geomanagement
-    \ingroup appearance
-    \mainclass
     A group box provides a frame, a title and a keyboard shortcut, and
 …
     Q_Q(QGroupBox);
     QWidget *fw = q->focusWidget();
     if (!fw) {
+    if (!fw || fw == q) {
         QWidget * best = 0;
         QWidget * candidate = 0;
 …
         if (best)
             fw = best;
+        else
+            if (candidate)
+        else if (candidate)
                 fw = candidate;
+    }
 …
         d->_q_fixFocus(fe->reason());
     } else {
+        QStyleOptionGroupBox box;
+        initStyleOption(&box);
+        QRect rect = style()->subControlRect(QStyle::CC_GroupBox, &box, QStyle::SC_GroupBoxCheckBox, this)
+            | style()->subControlRect(QStyle::CC_GroupBox, &box, QStyle::SC_GroupBoxLabel, this);
+        update(rect);
+        QWidget::focusInEvent(fe);
+    }
+}
 …
+{
     Q_D(QGroupBox);
+    if (d->checkable) {
+        if (d->checked != b)
+            update();
+        bool wasToggled = (b != d->checked);
+    if (d->checkable && b != d->checked) {
+        update();
         d->checked = b;
+        if (wasToggled) {
+            d->_q_setChildrenEnabled(b);
+            emit toggled(b);
+        }
+        d->_q_setChildrenEnabled(b);
+        emit toggled(b);
+    }
+}

trunk/src/gui/widgets/qgroupbox.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/qlabel.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     \ingroup basicwidgets
-    \ingroup text
-    \mainclass
     QLabel is used for displaying text or an image. No user
 …
+{
     Q_D(QLabel);
+    d->sendControlEvent(ev);
+    if (d->control) {
+        d->sendControlEvent(ev);
+        QTextCursor cursor = d->control->textCursor();
+        Qt::FocusReason reason = ev->reason();
+        if (reason != Qt::ActiveWindowFocusReason
+            && reason != Qt::PopupFocusReason
+            && cursor.hasSelection()) {
+            cursor.clearSelection();
+            d->control->setTextCursor(cursor);
+        }
+    }
     QFrame::focusOutEvent(ev);
+}
 …
     if (d->isTextLabel) {
         QRectF lr = d->layoutRect();
+        QStyleOption opt;
+        opt.initFrom(this);
+#ifndef QT_NO_STYLE_STYLESHEET
+        if (QStyleSheetStyle* cssStyle = qobject_cast<QStyleSheetStyle*>(style)) {
+            cssStyle->styleSheetPalette(this, &opt, &opt.palette);
+        }
+#endif
         if (d->control) {
 #ifndef QT_NO_SHORTCUT
 …
             QAbstractTextDocumentLayout::PaintContext context;
             QStyleOption opt(0);
             opt.init(this);
             if (!isEnabled() && style->styleHint(QStyle::SH_EtchDisabledText, &opt, this)) {
                 context.palette = palette();
+            if (!isEnabled() && !d->control &&
+                // We cannot support etched for rich text controls because custom
+                // colors and links will override the light palette
+                style->styleHint(QStyle::SH_EtchDisabledText, &opt, this)) {
+                context.palette = opt.palette;
                 context.palette.setColor(QPalette::Text, context.palette.light().color());
                 painter.save();
 …
             // Adjust the palette
+            context.palette = palette();
+#ifndef QT_NO_STYLE_STYLESHEET
+            if (QStyleSheetStyle* cssStyle = qobject_cast<QStyleSheetStyle*>(style)) {
+                cssStyle->focusPalette(this, &opt, &context.palette);
+            }
+#endif
+            context.palette = opt.palette;
             if (foregroundRole() != QPalette::Text && isEnabled())
 …
             if (d->hasShortcut) {
                 flags |= Qt::TextShowMnemonic;
-                QStyleOption opt;
-                opt.initFrom(this);
                 if (!style->styleHint(QStyle::SH_UnderlineShortcut, &opt, this))
                     flags |= Qt::TextHideMnemonic;
+            }
             style->drawItemText(&painter, lr.toRect(), flags, palette(), isEnabled(), d->text, foregroundRole());
+            style->drawItemText(&painter, lr.toRect(), flags, opt.palette, isEnabled(), d->text, foregroundRole());
+        }
     } else
 …
     hasShortcut = false;
+    if (control) {
+        ensureTextPopulated();
+        // Underline the first character that follows an ampersand
+        shortcutCursor = control->document()->find(QLatin1String("&"));
+        if (shortcutCursor.isNull())
+            return;
+        hasShortcut = true;
+        shortcutId = q->grabShortcut(QKeySequence::mnemonic(text));
+        shortcutCursor.deleteChar(); // remove the ampersand
+        shortcutCursor.movePosition(QTextCursor::NextCharacter, QTextCursor::KeepAnchor);
+    } else {
+        if (!text.contains(QLatin1String("&")))
+            return;
+        hasShortcut = true;
+        shortcutId = q->grabShortcut(QKeySequence::mnemonic(text));
+    }
+    if (!text.contains(QLatin1Char('&')))
+        return;
+    hasShortcut = true;
+    shortcutId = q->grabShortcut(QKeySequence::mnemonic(text));
+}
 …
 #endif
             doc->setUndoRedoEnabled(false);
+#ifndef QT_NO_SHORTCUT
+            if (hasShortcut) {
+                // Underline the first character that follows an ampersand (and remove the others ampersands)
+                int from = 0;
+                bool found = false;
+                QTextCursor cursor;
+                while (!(cursor = control->document()->find((QLatin1String("&")), from)).isNull()) {
+                    cursor.deleteChar(); // remove the ampersand
+                    cursor.movePosition(QTextCursor::NextCharacter, QTextCursor::KeepAnchor);
+                    from = cursor.position();
+                    if (!found && cursor.selectedText() != QLatin1String("&")) { //not a second &
+                        found = true;
+                        shortcutCursor = cursor;
+                    }
+                }
+            }
+#endif
+        }
+    }

trunk/src/gui/widgets/qlabel.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/qlabel_p.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     Qt::TextFormat textformat;
     mutable QTextControl *control;
     QTextCursor shortcutCursor;
+    mutable QTextCursor shortcutCursor;
     Qt::TextInteractionFlags textInteractionFlags;

trunk/src/gui/widgets/qlcdnumber.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     \ingroup basicwidgets
+    \mainclass
     It can display a number in just about any size. It can display
 …
     QLCDNumber emits the overflow() signal when it is asked to display
     something beyond its range. The range is set by setNumDigits(),
+    something beyond its range. The range is set by setDigitCount(),
     but setSmallDecimalPoint() also influences it. If the display is
     set to hexadecimal, octal or binary, the integer equivalent of the
 …
     a too-large number or a too-long string.
     It is never emitted by setNumDigits().
+    It is never emitted by setDigitCount().
 */
 …
     constructor.
     \sa setNumDigits(), setSmallDecimalPoint()
+    \sa setDigitCount(), setSmallDecimalPoint()
 */
 …
     constructor.
     \sa setNumDigits(), setSmallDecimalPoint()
+    \sa setDigitCount(), setSmallDecimalPoint()
 */
 …
     The \a parent argument is passed to the QFrame constructor.
     \sa setNumDigits(), setSmallDecimalPoint()
+    \sa setDigitCount(), setSmallDecimalPoint()
 */
 …
     numDigits, the base to decimal, the decimal point mode to 'small'
     and the frame style to a raised box. The segmentStyle() is set to
     \c Outline.
+    \c Filled.
     The \a parent argument is passed to the QFrame constructor.
     \sa setNumDigits(), setSmallDecimalPoint()
+    \sa setDigitCount(), setSmallDecimalPoint()
 */
 …
     base       = QLCDNumber::Dec;
     smallPoint = false;
     q->setNumDigits(ndigits);
     q->setSegmentStyle(QLCDNumber::Outline);
+    q->setDigitCount(ndigits);
+    q->setSegmentStyle(QLCDNumber::Filled);
     q->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum));
+}
 …
 /*!
+    \deprecated
     \property QLCDNumber::numDigits
+    \brief the current number of digits displayed
+    \sa digitCount
+*/
+void QLCDNumber::setNumDigits(int numDigits)
+{
+    setDigitCount(numDigits);
+}
+/*!
+    \since 4.6
+    \property QLCDNumber::digitCount
     \brief the current number of digits displayed
 …
 */
+void QLCDNumber::setNumDigits(int numDigits)
+/*!
+  Sets the current number of digits to \a numDigits. Must
+  be in the range 0..99.
+ */
+void QLCDNumber::setDigitCount(int numDigits)
+{
     Q_D(QLCDNumber);
 …
         d->digitStr.fill(QLatin1Char(' '), d->ndigits);
         d->points.fill(0, d->ndigits);
         d->digitStr[d->ndigits - 1] = QLatin1Char('0');            // "0" is the default number
+        d->digitStr[d->ndigits - 1] = QLatin1Char('0'); // "0" is the default number
     } else {
         bool doDisplay = d->ndigits == 0;
 …
 /*!
+  Returns the current number of digits.
+ */
+int QLCDNumber::digitCount() const
+{
+    Q_D(const QLCDNumber);
+    return d->ndigits;
+}
+/*!
     \overload
 …
     otherwise returns false.
     \sa display(), numDigits(), smallDecimalPoint()
+    \sa display(), digitCount(), smallDecimalPoint()
 */
 …
     otherwise returns false.
     \sa display(), numDigits(), smallDecimalPoint()
+    \sa display(), digitCount(), smallDecimalPoint()
 */
 …
     QPainter p(this);
     drawFrame(&p);
+    p.setRenderHint(QPainter::Antialiasing);
+    if (d->shadow)
+        p.translate(0.5, 0.5);
     if (d->smallPoint)
         d->drawString(d->digitStr, p, &d->points, false);
 …
+        }
         // End exact copy
         p.setPen(fgColor);
+        p.setPen(Qt::NoPen);
         p.setBrush(fgColor);
         p.drawPolygon(a);
 …
     \row \i \c Outline
          \i Produces raised segments filled with the background color
+    \row \i \c Filled
             (this is the default).
-    \row \i \c Filled
          \i Produces raised segments filled with the foreground color.
     \row \i \c Flat
 …
 QSize QLCDNumber::sizeHint() const
+{
     return QSize(10 + 9 * (numDigits() + (smallDecimalPoint() ? 0 : 1)), 23);
+    return QSize(10 + 9 * (digitCount() + (smallDecimalPoint() ? 0 : 1)), 23);
+}
 …
 /*!
     \fn int QLCDNumber::margin() const
     Returns the with of the the margin around the contents of the widget.
+    Returns the width of the margin around the contents of the widget.
     Use QWidget::getContentsMargins() instead.

trunk/src/gui/widgets/qlcdnumber.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     Q_PROPERTY(bool smallDecimalPoint READ smallDecimalPoint WRITE setSmallDecimalPoint)
     Q_PROPERTY(int numDigits READ numDigits WRITE setNumDigits)
+    Q_PROPERTY(int digitCount READ digitCount WRITE setDigitCount)
     Q_PROPERTY(Mode mode READ mode WRITE setMode)
     Q_PROPERTY(SegmentStyle segmentStyle READ segmentStyle WRITE setSegmentStyle)
 …
     bool smallDecimalPoint() const;
+    int numDigits() const;
+    void setNumDigits(int nDigits);
+#ifdef QT_DEPRECATED
+    QT_DEPRECATED int numDigits() const;
+    QT_DEPRECATED void setNumDigits(int nDigits);
+#endif
+    int digitCount() const;
+    void setDigitCount(int nDigits);
     bool checkOverflow(double num) const;

trunk/src/gui/widgets/qlineedit.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #include "private/qshortcutmap_p.h"
 #include "qkeysequence.h"
 #define ACCEL_KEY(k) (!qApp->d_func()->shortcutMap.hasShortcutForKeySequence(k) ? QLatin1String("\t") + QString(QKeySequence(k)) : QString())
+#define ACCEL_KEY(k) (!qApp->d_func()->shortcutMap.hasShortcutForKeySequence(k) ? QLatin1Char('\t') + QString(QKeySequence(k)) : QString())
 #else
 #define ACCEL_KEY(k) QString()
 …
 #include <limits.h>
-#define verticalMargin 1
-#define horizontalMargin 2
 QT_BEGIN_NAMESPACE
 …
 extern void qt_mac_secure_keyboard(bool); //qapplication_mac.cpp
 #endif
-static inline bool shouldEnableInputMethod(QLineEdit *lineedit)
+{
-    const QLineEdit::EchoMode mode = lineedit->echoMode();
-    return !lineedit->isReadOnly() && (mode == QLineEdit::Normal || mode == QLineEdit::PasswordEchoOnEdit);
+}
 /*!
 …
     option->midLineWidth = 0;
     option->state |= QStyle::State_Sunken;
     if (d->readOnly)
+    if (d->control->isReadOnly())
         option->state |= QStyle::State_ReadOnly;
 #ifdef QT_KEYPAD_NAVIGATION
 …
     \ingroup basicwidgets
+    \mainclass
     A line edit allows the user to enter and edit a single line of
 …
     Q_D(QLineEdit);
     setObjectName(QString::fromAscii(name));
+    d->parseInputMask(inputMask);
+    if (d->maskData) {
+        QString ms = d->maskString(0, contents);
+        d->init(ms + d->clearString(ms.length(), d->maxLength - ms.length()));
+        d->cursor = d->nextMaskBlank(ms.length());
+    } else {
+        d->init(contents);
+    }
+    d->init(contents);
+    d->control->setInputMask(inputMask);
+    d->control->moveCursor(d->control->nextMaskBlank(contents.length()));
+}
 #endif
 …
+{
     Q_D(const QLineEdit);
+    QString res = d->text;
+    if (d->maskData)
+        res = d->stripString(d->text);
+    return (res.isNull() ? QString::fromLatin1("") : res);
+    return d->control->text();
+}
 …
+{
     Q_D(QLineEdit);
+    d->setText(text, -1, false);
+#ifdef QT_KEYPAD_NAVIGATION
+    d->origText = d->text;
+#endif
+}
+    d->control->setText(text);
+}
+// ### Qt 4.7: remove this #if guard
+#if (QT_VERSION >= 0x407000) || defined(Q_WS_MAEMO_5)
+/*!
+    \since 4.7
+    \property QLineEdit::placeholderText
+    \brief the line edit's placeholder text
+    Setting this property makes the line edit display a grayed-out
+    placeholder text as long as the text() is empty and the widget doesn't
+    have focus.
+    By default, this property contains an empty string.
+    \sa text()
+*/
+QString QLineEdit::placeholderText() const
+{
+    Q_D(const QLineEdit);
+    return d->placeholderText;
+}
+void QLineEdit::setPlaceholderText(const QString& placeholderText)
+{
+    Q_D(QLineEdit);
+    if (d->placeholderText != placeholderText) {
+        d->placeholderText = placeholderText;
+        if (!hasFocus())
+            update();
+    }
+}
+#endif
 /*!
 …
+{
     Q_D(const QLineEdit);
+    if (d->echoMode == NoEcho)
+        return QString::fromLatin1("");
+    QString res = d->text;
+    if (d->echoMode == Password || (d->echoMode == PasswordEchoOnEdit
+                                    && !d->passwordEchoEditing)) {
+        QStyleOptionFrameV2 opt;
+        initStyleOption(&opt);
+        res.fill(style()->styleHint(QStyle::SH_LineEdit_PasswordCharacter, &opt, this));
+    }
+    return (res.isNull() ? QString::fromLatin1("") : res);
+    return d->control->displayText();
+}
 …
+{
     Q_D(const QLineEdit);
     return d->maxLength;
+    return d->control->maxLength();
+}
 …
+{
     Q_D(QLineEdit);
+    if (d->maskData)
+        return;
+    d->maxLength = maxLength;
+    setText(d->text);
+}
+    d->control->setMaxLength(maxLength);
+}
 /*!
 …
+{
     Q_D(const QLineEdit);
     return (EchoMode) d->echoMode;
+    return (EchoMode) d->control->echoMode();
+}
 …
+{
     Q_D(QLineEdit);
     if (mode == (EchoMode)d->echoMode)
+    if (mode == (EchoMode)d->control->echoMode())
         return;
+    setAttribute(Qt::WA_InputMethodEnabled, shouldEnableInputMethod(this));
+    d->echoMode = mode;
+    d->passwordEchoEditing = false;
+    d->updateTextLayout();
+    Qt::InputMethodHints imHints = inputMethodHints();
+    if (mode == Password) {
+        imHints |= Qt::ImhHiddenText;
+    } else {
+        imHints &= ~Qt::ImhHiddenText;
+    }
+    setInputMethodHints(imHints);
+    d->control->setEchoMode(mode);
     update();
 #ifdef Q_WS_MAC
     if (hasFocus())
         qt_mac_secure_keyboard(d->echoMode == Password || d->echoMode == NoEcho);
+        qt_mac_secure_keyboard(mode == Password || mode == NoEcho);
 #endif
+}
 …
+{
     Q_D(const QLineEdit);
     return d->validator;
+    return d->control->validator();
+}
 …
+{
     Q_D(QLineEdit);
     d->validator = const_cast<QValidator*>(v);
+    d->control->setValidator(v);
+}
 #endif // QT_NO_VALIDATOR
 …
+{
     Q_D(QLineEdit);
     if (c == d->completer)
+    if (c == d->control->completer())
         return;
     if (d->completer) {
         disconnect(d->completer, 0, this, 0);
         d->completer->setWidget(0);
         if (d->completer->parent() == this)
             delete d->completer;
+    }
     d->completer = c;
+    if (d->control->completer()) {
+        disconnect(d->control->completer(), 0, this, 0);
+        d->control->completer()->setWidget(0);
+        if (d->control->completer()->parent() == this)
+            delete d->control->completer();
+    }
+    d->control->setCompleter(c);
     if (!c)
         return;
 …
         c->setWidget(this);
     if (hasFocus()) {
         QObject::connect(d->completer, SIGNAL(activated(QString)),
+        QObject::connect(d->control->completer(), SIGNAL(activated(QString)),
                          this, SLOT(setText(QString)));
         QObject::connect(d->completer, SIGNAL(highlighted(QString)),
+        QObject::connect(d->control->completer(), SIGNAL(highlighted(QString)),
                          this, SLOT(_q_completionHighlighted(QString)));
+    }
 …
+{
     Q_D(const QLineEdit);
+    return d->completer;
+}
+// looks for an enabled item iterating forward(dir=1)/backward(dir=-1) from the
+// current row based. dir=0 indicates a new completion prefix was set.
+bool QLineEditPrivate::advanceToEnabledItem(int dir)
+{
+    int start = completer->currentRow();
+    if (start == -1)
+        return false;
+    int i = start + dir;
+    if (dir == 0) dir = 1;
+    do {
+        if (!completer->setCurrentRow(i)) {
+            if (!completer->wrapAround())
+                break;
+            i = i > 0 ? 0 : completer->completionCount() - 1;
+        } else {
+            QModelIndex currentIndex = completer->currentIndex();
+            if (completer->completionModel()->flags(currentIndex) & Qt::ItemIsEnabled)
+                return true;
+            i += dir;
+        }
+    } while (i != start);
+    completer->setCurrentRow(start); // restore
+    return false;
+}
+void QLineEditPrivate::complete(int key)
+{
+    if (!completer || readOnly || echoMode != QLineEdit::Normal)
+        return;
+    if (completer->completionMode() == QCompleter::InlineCompletion) {
+        if (key == Qt::Key_Backspace)
+            return;
+        int n = 0;
+        if (key == Qt::Key_Up || key == Qt::Key_Down) {
+            if (selend != 0 && selend != text.length())
+                return;
+            QString prefix = hasSelectedText() ? text.left(selstart) : text;
+            if (text.compare(completer->currentCompletion(), completer->caseSensitivity()) != 0
+                || prefix.compare(completer->completionPrefix(), completer->caseSensitivity()) != 0) {
+                completer->setCompletionPrefix(prefix);
+            } else {
+                n = (key == Qt::Key_Up) ? -1 : +1;
+            }
+        } else {
+            completer->setCompletionPrefix(text);
+        }
+        if (!advanceToEnabledItem(n))
+            return;
+    } else {
+#ifndef QT_KEYPAD_NAVIGATION
+        if (text.isEmpty()) {
+            completer->popup()->hide();
+            return;
+        }
+#endif
+        completer->setCompletionPrefix(text);
+    }
+    completer->complete();
+}
+void QLineEditPrivate::_q_completionHighlighted(QString newText)
+{
+    Q_Q(QLineEdit);
+    if (completer->completionMode() != QCompleter::InlineCompletion)
+        q->setText(newText);
+    else {
+        int c = cursor;
+        q->setText(text.left(c) + newText.mid(c));
+        q->setSelection(text.length(), c - newText.length());
+    }
+}
+    return d->control->completer();
+}
 #endif // QT_NO_COMPLETER
 …
     ensurePolished();
     QFontMetrics fm(font());
     int h = qMax(fm.lineSpacing(), 14) + 2*verticalMargin
+    int h = qMax(fm.height(), 14) + 2*d->verticalMargin
             + d->topTextMargin + d->bottomTextMargin
             + d->topmargin + d->bottommargin;
     int w = fm.width(QLatin1Char('x')) * 17 + 2*horizontalMargin
+    int w = fm.width(QLatin1Char('x')) * 17 + 2*d->horizontalMargin
             + d->leftTextMargin + d->rightTextMargin
             + d->leftmargin + d->rightmargin; // "some"
 …
     ensurePolished();
     QFontMetrics fm = fontMetrics();
     int h = fm.height() + qMax(2*verticalMargin, fm.leading())
+    int h = fm.height() + qMax(2*d->verticalMargin, fm.leading())
             + d->topmargin + d->bottommargin;
     int w = fm.maxWidth() + d->leftmargin + d->rightmargin;
 …
+{
     Q_D(const QLineEdit);
     return d->cursor;
+    return d->control->cursorPosition();
+}
 …
+{
     Q_D(QLineEdit);
+    if (pos < 0)
+        pos = 0;
+    if (pos <= d->text.length())
+        d->moveCursor(pos);
+    d->control->setCursorPosition(pos);
+}
 …
                                  int newMarkAnchor, int newMarkDrag)
+{
+    Q_D(QLineEdit);
+    int priorState = d->undoState;
+    d->selstart = 0;
+    d->selend = d->text.length();
+    d->removeSelectedText();
+    d->insert(newText);
+    d->finishChange(priorState);
+    if (d->undoState > priorState) {
+        d->cursor = newPos;
+        d->selstart = qMin(newMarkAnchor, newMarkDrag);
+        d->selend = qMax(newMarkAnchor, newMarkDrag);
+        update();
+        d->emitCursorPositionChanged();
+        return true;
+    }
+    return false;
+    // The suggested functions above in the docs don't seem to validate,
+    // below code tries to mimic previous behaviour.
+    QString oldText = text();
+    setText(newText);
+    if(!hasAcceptableInput()){
+        setText(oldText);
+        return false;
+    }
+    setCursorPosition(newPos);
+    setSelection(qMin(newMarkAnchor, newMarkDrag), qAbs(newMarkAnchor - newMarkDrag));
+    return true;
+}
 #endif //QT3_SUPPORT
 …
+{
     Q_D(QLineEdit);
+    int cursor = d->cursor;
+    if (steps > 0) {
+        while(steps--)
+            cursor = d->textLayout.nextCursorPosition(cursor);
+    } else if (steps < 0) {
+        while (steps++)
+            cursor = d->textLayout.previousCursorPosition(cursor);
+    }
+    d->moveCursor(cursor, mark);
+    d->control->cursorForward(mark, steps);
+}
 …
+{
     Q_D(QLineEdit);
     d->moveCursor(d->textLayout.nextCursorPosition(d->cursor, QTextLayout::SkipWords), mark);
+    d->control->cursorWordForward(mark);
+}
 …
+{
     Q_D(QLineEdit);
     d->moveCursor(d->textLayout.previousCursorPosition(d->cursor, QTextLayout::SkipWords), mark);
+    d->control->cursorWordBackward(mark);
+}
 …
+{
     Q_D(QLineEdit);
+    int priorState = d->undoState;
+    if (d->hasSelectedText()) {
+        d->removeSelectedText();
+    } else if (d->cursor) {
+            --d->cursor;
+            if (d->maskData)
+                d->cursor = d->prevMaskBlank(d->cursor);
+            QChar uc = d->text.at(d->cursor);
+            if (d->cursor > 0 && uc.unicode() >= 0xdc00 && uc.unicode() < 0xe000) {
+                // second half of a surrogate, check if we have the first half as well,
+                // if yes delete both at once
+                uc = d->text.at(d->cursor - 1);
+                if (uc.unicode() >= 0xd800 && uc.unicode() < 0xdc00) {
+                    d->del(true);
+                    --d->cursor;
+                }
+            }
+            d->del(true);
+    }
+    d->finishChange(priorState);
+    d->control->backspace();
+}
 …
+{
     Q_D(QLineEdit);
+    int priorState = d->undoState;
+    if (d->hasSelectedText()) {
+        d->removeSelectedText();
+    } else {
+        int n = d->textLayout.nextCursorPosition(d->cursor) - d->cursor;
+        while (n--)
+            d->del();
+    }
+    d->finishChange(priorState);
+    d->control->del();
+}
 …
+{
     Q_D(QLineEdit);
     d->moveCursor(0, mark);
+    d->control->home(mark);
+}
 …
+{
     Q_D(QLineEdit);
     d->moveCursor(d->text.length(), mark);
+    d->control->end(mark);
+}
 …
+{
     Q_D(const QLineEdit);
     return d->modifiedState != d->undoState;
+    return d->control->isModified();
+}
 …
+{
     Q_D(QLineEdit);
+    if (modified)
+        d->modifiedState = -1;
+    else
+        d->modifiedState = d->undoState;
+    d->control->setModified(modified);
+}
 …
+{
     Q_D(const QLineEdit);
     return d->hasSelectedText();
+    return d->control->hasSelectedText();
+}
 …
+{
     Q_D(const QLineEdit);
+    if (d->hasSelectedText())
+        return d->text.mid(d->selstart, d->selend - d->selstart);
+    return QString();
+    return d->control->selectedText();
+}
 …
+{
     Q_D(const QLineEdit);
     return d->hasSelectedText() ? d->selstart : -1;
+    return d->control->selectionStart();
+}
 …
+{
     Q_D(const QLineEdit);
+    int pos = d->xToPos(xpos + contentsRect().x() - d->hscroll + horizontalMargin);
+    if (chr && pos < (int) d->text.length())
+        *chr = d->text.at(pos);
+    int pos = d->xToPos(xpos + contentsRect().x() - d->hscroll + d->horizontalMargin);
+    QString txt = d->control->text();
+    if (chr && pos < (int) txt.length())
+        *chr = txt.at(pos);
     return pos;
 …
+{
     Q_D(QLineEdit);
     if (d->hasSelectedText() && start && end) {
         *start = d->selstart;
         *end = d->selend;
+    if (d->control->hasSelectedText() && start && end) {
+        *start = selectionStart();
+        *end = *start + selectedText().length();
         return true;
+    }
 …
+{
     Q_D(QLineEdit);
     if (start < 0 || start > (int)d->text.length()) {
+    if (start < 0 || start > (int)d->control->text().length()) {
         qWarning("QLineEdit::setSelection: Invalid start position (%d)", start);
         return;
+    } else {
+        if (length > 0) {
+            d->selstart = start;
+            d->selend = qMin(start + length, (int)d->text.length());
+            d->cursor = d->selend;
+        } else {
+            d->selstart = qMax(start + length, 0);
+            d->selend = start;
+            d->cursor = d->selstart;
+        }
+    }
+    if (d->hasSelectedText()){
+    }
+    d->control->setSelection(start, length);
+    if (d->control->hasSelectedText()){
         QStyleOptionFrameV2 opt;
         initStyleOption(&opt);
 …
             d->setCursorVisible(false);
+    }
-    update();
-    d->emitCursorPositionChanged();
+}
 …
+{
     Q_D(const QLineEdit);
     return d->isUndoAvailable();
+    return d->control->isUndoAvailable();
+}
 …
+{
     Q_D(const QLineEdit);
     return d->isRedoAvailable();
+    return d->control->isRedoAvailable();
+}
 …
+{
     Q_D(const QLineEdit);
     return d->hasAcceptableInput(d->text);
+    return d->control->hasAcceptableInput();
+}
 …
     updateGeometry();
     update();
+}
+/*!
+    \since 4.6
+    Sets the \a margins around the text inside the frame.
+    See also textMargins().
+*/
+void QLineEdit::setTextMargins(const QMargins &margins)
+{
+    setTextMargins(margins.left(), margins.top(), margins.right(), margins.bottom());
+}
 …
     if (bottom)
         *bottom = d->bottomTextMargin;
+}
+/*!
+    \since 4.6
+    Returns the widget's text margins.
+    \sa setTextMargins()
+*/
+QMargins QLineEdit::textMargins() const
+{
+    Q_D(const QLineEdit);
+    return QMargins(d->leftTextMargin, d->topTextMargin, d->rightTextMargin, d->bottomTextMargin);
+}
 …
+{
     Q_D(const QLineEdit);
     return (d->maskData ? d->inputMask + QLatin1Char(';') + d->blank : QString());
+    return d->control->inputMask();
+}
 …
+{
     Q_D(QLineEdit);
+    d->parseInputMask(inputMask);
+    if (d->maskData)
+        d->moveCursor(d->nextMaskBlank(0));
+    d->control->setInputMask(inputMask);
+}
 …
+{
     Q_D(QLineEdit);
+    d->selstart = d->selend = d->cursor = 0;
+    d->moveCursor(d->text.length(), true);
+    d->control->selectAll();
+}
 …
+{
     Q_D(QLineEdit);
+    d->deselect();
+    d->finishChange();
+    d->control->deselect();
+}
 …
 //     q->resetInputContext(); //#### FIX ME IN QT
     Q_D(QLineEdit);
+    int priorState = d->undoState;
+    d->removeSelectedText();
+    d->insert(newText);
+    d->finishChange(priorState);
+    d->control->insert(newText);
+}
 …
+{
     Q_D(QLineEdit);
-    int priorState = d->undoState;
     resetInputContext();
+    d->selstart = 0;
+    d->selend = d->text.length();
+    d->removeSelectedText();
+    d->separate();
+    d->finishChange(priorState, /*update*/false, /*edited*/false);
+    d->control->clear();
+}
 …
     Q_D(QLineEdit);
     resetInputContext();
+    d->undo();
+    d->finishChange(-1, true);
+    d->control->undo();
+}
 …
     Q_D(QLineEdit);
     resetInputContext();
+    d->redo();
+    d->finishChange();
+    d->control->redo();
+}
 …
+{
     Q_D(const QLineEdit);
     return d->readOnly;
+    return d->control->isReadOnly();
+}
 …
+{
     Q_D(QLineEdit);
     if (d->readOnly != enable) {
         d->readOnly = enable;
         setAttribute(Qt::WA_MacShowFocusRect, !d->readOnly);
         setAttribute(Qt::WA_InputMethodEnabled, shouldEnableInputMethod(this));
+    if (d->control->isReadOnly() != enable) {
+        d->control->setReadOnly(enable);
+        setAttribute(Qt::WA_MacShowFocusRect, !enable);
+        setAttribute(Qt::WA_InputMethodEnabled, d->shouldEnableInputMethod());
 #ifndef QT_NO_CURSOR
         setCursor(enable ? Qt::ArrowCursor : Qt::IBeamCursor);
 …
+{
     Q_D(const QLineEdit);
     d->copy();
+    d->control->copy();
+}
 …
+{
     Q_D(QLineEdit);
+    if (echoMode() == PasswordEchoOnEdit && !d->passwordEchoEditing) {
+        // Clear the edit and reset to normal echo mode when pasting; the echo
+        // mode switches back when the edit loses focus.  ### changes a public
+        // property, resets current content
+        d->updatePasswordEchoEditing(true);
+        clear();
+    }
+    insert(QApplication::clipboard()->text(QClipboard::Clipboard));
+}
+void QLineEditPrivate::copy(bool clipboard) const
+{
+    Q_Q(const QLineEdit);
+    QString t = q->selectedText();
+    if (!t.isEmpty() && echoMode == QLineEdit::Normal) {
+        q->disconnect(QApplication::clipboard(), SIGNAL(selectionChanged()), q, 0);
+        QApplication::clipboard()->setText(t, clipboard ? QClipboard::Clipboard : QClipboard::Selection);
+        q->connect(QApplication::clipboard(), SIGNAL(selectionChanged()),
+                   q, SLOT(_q_clipboardChanged()));
+    }
+    d->control->paste();
+}
 …
+{
     Q_D(QLineEdit);
+#ifndef QT_NO_SHORTCUT
+    if (e->type() == QEvent::ShortcutOverride && !d->readOnly) {
+        QKeyEvent* ke = (QKeyEvent*) e;
+        if (ke == QKeySequence::Copy
+            || ke == QKeySequence::Paste
+            || ke == QKeySequence::Cut
+            || ke == QKeySequence::Redo
+            || ke == QKeySequence::Undo
+            || ke == QKeySequence::MoveToNextWord
+            || ke == QKeySequence::MoveToPreviousWord
+            || ke == QKeySequence::MoveToStartOfDocument
+            || ke == QKeySequence::MoveToEndOfDocument
+            || ke == QKeySequence::SelectNextWord
+            || ke == QKeySequence::SelectPreviousWord
+            || ke == QKeySequence::SelectStartOfLine
+            || ke == QKeySequence::SelectEndOfLine
+            || ke == QKeySequence::SelectStartOfBlock
+            || ke == QKeySequence::SelectEndOfBlock
+            || ke == QKeySequence::SelectStartOfDocument
+            || ke == QKeySequence::SelectAll
+            || ke == QKeySequence::SelectEndOfDocument) {
+            ke->accept();
+        } else if (ke->modifiers() == Qt::NoModifier || ke->modifiers() == Qt::ShiftModifier
+                   || ke->modifiers() == Qt::KeypadModifier) {
+            if (ke->key() < Qt::Key_Escape) {
+                ke->accept();
+            } else {
+                switch (ke->key()) {
+                case Qt::Key_Delete:
+                case Qt::Key_Home:
+                case Qt::Key_End:
+                case Qt::Key_Backspace:
+                case Qt::Key_Left:
+                case Qt::Key_Right:
+                    ke->accept();
+                default:
+                    break;
+                }
+            }
+        }
+    } else
+#endif
+        if (e->type() == QEvent::Timer) {
+    if (e->type() == QEvent::Timer) {
         // should be timerEvent, is here for binary compatibility
         int timerId = ((QTimerEvent*)e)->timerId();
+        if (timerId == d->cursorTimer) {
+            QStyleOptionFrameV2 opt;
+            initStyleOption(&opt);
+            if(!hasSelectedText()
+               || style()->styleHint(QStyle::SH_BlinkCursorWhenTextSelected, &opt, this))
+                d->setCursorVisible(!d->cursorVisible);
+        if (false) {
 #ifndef QT_NO_DRAGANDDROP
         } else if (timerId == d->dndTimer.timerId()) {
 …
         else if (timerId == d->tripleClickTimer.timerId())
             d->tripleClickTimer.stop();
-#ifdef QT_KEYPAD_NAVIGATION
-        else if (timerId == d->deleteAllTimer.timerId()) {
-            d->deleteAllTimer.stop();
-            clear();
+        }
-#endif
     } else if (e->type() == QEvent::ContextMenu) {
 #ifndef QT_NO_IM
         if (d->composeMode())
+        if (d->control->composeMode())
             return true;
 #endif
         d->separate();
+        //d->separate();
     } else if (e->type() == QEvent::WindowActivate) {
         QTimer::singleShot(0, this, SLOT(_q_handleWindowActivate()));
+    }
+    }else if(e->type() == QEvent::ShortcutOverride){
+        d->control->processEvent(e);
+    } else if (e->type() == QEvent::KeyRelease) {
+        d->control->setCursorBlinkPeriod(QApplication::cursorFlashTime());
+    } else if (e->type() == QEvent::Show) {
+        //In order to get the cursor blinking if QComboBox::setEditable is called when the combobox has focus
+        if (hasFocus()) {
+            d->control->setCursorBlinkPeriod(QApplication::cursorFlashTime());
+            QStyleOptionFrameV2 opt;
+            initStyleOption(&opt);
+            if ((!hasSelectedText() && d->control->preeditAreaText().isEmpty())
+                || style()->styleHint(QStyle::SH_BlinkCursorWhenTextSelected, &opt, this))
+                d->setCursorVisible(true);
+        }
+    }
 #ifdef QT_KEYPAD_NAVIGATION
     if (QApplication::keypadNavigationEnabled()) {
+        if ((e->type() == QEvent::KeyPress) || (e->type() == QEvent::KeyRelease)) {
+            QKeyEvent *ke = (QKeyEvent *)e;
+            if (ke->key() == Qt::Key_Back) {
+                if (ke->isAutoRepeat()) {
+                    // Swallow it. We don't want back keys running amok.
+                    ke->accept();
+                    return true;
+                }
+                if ((e->type() == QEvent::KeyRelease)
+                    && !isReadOnly()
+                    && d->deleteAllTimer.isActive()) {
+                    d->deleteAllTimer.stop();
+                    backspace();
+                    ke->accept();
+                    return true;
+                }
+            }
+        } else if (e->type() == QEvent::EnterEditFocus) {
+        if (e->type() == QEvent::EnterEditFocus) {
             end(false);
+            if (!d->cursorTimer) {
+                int cft = QApplication::cursorFlashTime();
+                d->cursorTimer = cft ? startTimer(cft/2) : -1;
+            }
+            d->setCursorVisible(true);
+            d->control->setCursorBlinkPeriod(QApplication::cursorFlashTime());
         } else if (e->type() == QEvent::LeaveEditFocus) {
             d->setCursorVisible(false);
+            if (d->cursorTimer > 0)
+                killTimer(d->cursorTimer);
+            d->cursorTimer = 0;
+            if (!d->emitingEditingFinished) {
+                if (hasAcceptableInput() || d->fixup()) {
+                    d->emitingEditingFinished = true;
+                    emit editingFinished();
+                    d->emitingEditingFinished = false;
+                }
+            }
+            d->control->setCursorBlinkPeriod(0);
+            if (d->control->hasAcceptableInput() || d->control->fixup())
+                emit editingFinished();
+        }
+    }
 …
     Q_D(QLineEdit);
     if (d->sendMouseEventToInputContext(e))
         return;
+        return;
     if (e->button() == Qt::RightButton)
         return;
 …
         setEditFocus(true);
         // Get the completion list to pop up.
         if (d->completer)
             d->completer->complete();
+        if (d->control->completer())
+            d->control->completer()->complete();
+    }
 #endif
 …
     int cursor = d->xToPos(e->pos().x());
 #ifndef QT_NO_DRAGANDDROP
+    if (!mark && d->dragEnabled && d->echoMode == Normal &&
+         e->button() == Qt::LeftButton && d->inSelection(e->pos().x())) {
+        d->cursor = cursor;
+        update();
+    if (!mark && d->dragEnabled && d->control->echoMode() == Normal &&
+         e->button() == Qt::LeftButton && d->control->inSelection(e->pos().x())) {
         d->dndPos = e->pos();
         if (!d->dndTimer.isActive())
             d->dndTimer.start(QApplication::startDragTime(), this);
-        d->emitCursorPositionChanged();
     } else
 #endif
+    {
         d->moveCursor(cursor, mark);
+        d->control->moveCursor(cursor, mark);
+    }
+}
 …
     Q_D(QLineEdit);
     if (d->sendMouseEventToInputContext(e))
         return;
+        return;
     if (e->buttons() & Qt::LeftButton) {
 …
 #endif
+        {
             d->moveCursor(d->xToPos(e->pos().x()), true);
+            d->control->moveCursor(d->xToPos(e->pos().x()), true);
+        }
+    }
 …
     Q_D(QLineEdit);
     if (d->sendMouseEventToInputContext(e))
         return;
+        return;
 #ifndef QT_NO_DRAGANDDROP
     if (e->button() == Qt::LeftButton) {
 …
     if (QApplication::clipboard()->supportsSelection()) {
         if (e->button() == Qt::LeftButton) {
             d->copy(false);
         } else if (!d->readOnly && e->button() == Qt::MidButton) {
             d->deselect();
+            d->control->copy(QClipboard::Selection);
+        } else if (!d->control->isReadOnly() && e->button() == Qt::MidButton) {
+            deselect();
             insert(QApplication::clipboard()->text(QClipboard::Selection));
+        }
+    }
 #endif
+    if (!isReadOnly() && rect().contains(e->pos()))
+        d->handleSoftwareInputPanel(e->button(), d->clickCausedFocus);
+    d->clickCausedFocus = 0;
+}
 …
     Q_D(QLineEdit);
     if (d->sendMouseEventToInputContext(e))
         return;
+        return;
     if (e->button() == Qt::LeftButton) {
+        deselect();
+        d->cursor = d->xToPos(e->pos().x());
+        d->cursor = d->textLayout.previousCursorPosition(d->cursor, QTextLayout::SkipWords);
+        // ## text layout should support end of words.
+        int end = d->textLayout.nextCursorPosition(d->cursor, QTextLayout::SkipWords);
+        while (end > d->cursor && d->text[end-1].isSpace())
+            --end;
+        d->moveCursor(end, true);
+        d->control->selectWordAtPos(d->xToPos(e->pos().x()));
         d->tripleClickTimer.start(QApplication::doubleClickInterval(), this);
         d->tripleClick = e->pos();
 …
+{
     Q_D(QLineEdit);
+    bool inlineCompletionAccepted = false;
+#ifndef QT_NO_COMPLETER
+    if (d->completer) {
+        QCompleter::CompletionMode completionMode = d->completer->completionMode();
+        if ((completionMode == QCompleter::PopupCompletion
+             || completionMode == QCompleter::UnfilteredPopupCompletion)
+            &&d->completer->popup()
+            && d->completer->popup()->isVisible()) {
+            // The following keys are forwarded by the completer to the widget
+            // Ignoring the events lets the completer provide suitable default behavior
+            switch (event->key()) {
+            case Qt::Key_Escape:
+                event->ignore();
+                return;
+            case Qt::Key_Enter:
+            case Qt::Key_Return:
+            case Qt::Key_F4:
+#ifdef QT_KEYPAD_NAVIGATION
+            case Qt::Key_Select:
+                if (!QApplication::keypadNavigationEnabled())
+                    break;
+#endif
+                d->completer->popup()->hide(); // just hide. will end up propagating to parent
+            default:
+                break; // normal key processing
+            }
+        } else if (completionMode == QCompleter::InlineCompletion) {
+            switch (event->key()) {
+            case Qt::Key_Enter:
+            case Qt::Key_Return:
+            case Qt::Key_F4:
+#ifdef QT_KEYPAD_NAVIGATION
+            case Qt::Key_Select:
+                if (!QApplication::keypadNavigationEnabled())
+                    break;
+#endif
+                if (!d->completer->currentCompletion().isEmpty() && d->selend > d->selstart
+                    && d->selend == d->text.length()) {
+                    setText(d->completer->currentCompletion());
+                    inlineCompletionAccepted = true;
+                }
+            default:
+                break; // normal key processing
+            }
+        }
+    }
+#endif // QT_NO_COMPLETER
+#ifdef QT_KEYPAD_NAVIGATION
+    #ifdef QT_KEYPAD_NAVIGATION
     bool select = false;
     switch (event->key()) {
 …
                 if (hasEditFocus()) {
                     setEditFocus(false);
                     if (d->completer && d->completer->popup()->isVisible())
                         d->completer->popup()->hide();
+                    if (d->control->completer() && d->control->completer()->popup()->isVisible())
+                        d->control->completer()->popup()->hide();
                     select = true;
+                }
 …
+                    {
                         setEditFocus(true);
+#ifndef Q_OS_SYMBIAN
                         clear();
+#endif
                     } else {
                         event->ignore();
 …
+    }
 #endif
+    if (echoMode() == PasswordEchoOnEdit
+        && !d->passwordEchoEditing
+        && !isReadOnly()
+        && !event->text().isEmpty()
+#ifdef QT_KEYPAD_NAVIGATION
+        && event->key() != Qt::Key_Select
+        && event->key() != Qt::Key_Up
+        && event->key() != Qt::Key_Down
+        && event->key() != Qt::Key_Back
+#endif
+        && !(event->modifiers() & Qt::ControlModifier)) {
+        // Clear the edit and reset to normal echo mode while editing; the
+        // echo mode switches back when the edit loses focus.  ### changes a
+        // public property, resets current content.  dubious code; you can
+        // navigate with keys up, down, back, and select(?), but if you press
+        // "left" or "right" it clears?
+        d->updatePasswordEchoEditing(true);
+        clear();
+    }
+    d->setCursorVisible(true);
+    if (event->key() == Qt::Key_Enter || event->key() == Qt::Key_Return) {
+        if (hasAcceptableInput() || d->fixup()) {
+            emit returnPressed();
+            d->emitingEditingFinished = true;
+            emit editingFinished();
+            d->emitingEditingFinished = false;
+        }
+        if (inlineCompletionAccepted)
+            event->accept();
+        else
+            event->ignore();
+        return;
+    }
+    bool unknown = false;
+    if (false) {
+    }
+#ifndef QT_NO_SHORTCUT
+    else if (event == QKeySequence::Undo) {
+        if (!d->readOnly)
+            undo();
+    }
+    else if (event == QKeySequence::Redo) {
+        if (!d->readOnly)
+            redo();
+    }
+    else if (event == QKeySequence::SelectAll) {
+        selectAll();
+    }
+#ifndef QT_NO_CLIPBOARD
+    else if (event == QKeySequence::Copy) {
+        copy();
+    }
+    else if (event == QKeySequence::Paste) {
+        if (!d->readOnly)
+            paste();
+    }
+    else if (event == QKeySequence::Cut) {
+        if (!d->readOnly) {
+            cut();
+        }
+    }
+    else if (event == QKeySequence::DeleteEndOfLine) {
+        if (!d->readOnly) {
+            setSelection(d->cursor, d->text.size());
+            copy();
+            del();
+        }
+    }
+#endif //QT_NO_CLIPBOARD
+    else if (event == QKeySequence::MoveToStartOfLine) {
+        home(0);
+    }
+    else if (event == QKeySequence::MoveToEndOfLine) {
+        end(0);
+    }
+    else if (event == QKeySequence::SelectStartOfLine) {
+        home(1);
+    }
+    else if (event == QKeySequence::SelectEndOfLine) {
+        end(1);
+    }
+    else if (event == QKeySequence::MoveToNextChar) {
+#if !defined(Q_WS_WIN) || defined(QT_NO_COMPLETER)
+        if (d->hasSelectedText()) {
+#else
+        if (d->hasSelectedText() && d->completer
+            && d->completer->completionMode() == QCompleter::InlineCompletion) {
+#endif
+            d->moveCursor(d->selend, false);
+        } else {
+            cursorForward(0, layoutDirection() == Qt::LeftToRight ? 1 : -1);
+        }
+    }
+    else if (event == QKeySequence::SelectNextChar) {
+        cursorForward(1, layoutDirection() == Qt::LeftToRight ? 1 : -1);
+    }
+    else if (event == QKeySequence::MoveToPreviousChar) {
+#if !defined(Q_WS_WIN) || defined(QT_NO_COMPLETER)
+        if (d->hasSelectedText()) {
+#else
+        if (d->hasSelectedText() && d->completer
+            && d->completer->completionMode() == QCompleter::InlineCompletion) {
+#endif
+            d->moveCursor(d->selstart, false);
+        } else {
+            cursorBackward(0, layoutDirection() == Qt::LeftToRight ? 1 : -1);
+        }
+    }
+    else if (event == QKeySequence::SelectPreviousChar) {
+        cursorBackward(1, layoutDirection() == Qt::LeftToRight ? 1 : -1);
+    }
+    else if (event == QKeySequence::MoveToNextWord) {
+        if (echoMode() == Normal)
+            layoutDirection() == Qt::LeftToRight ? cursorWordForward(0) : cursorWordBackward(0);
+        else
+            layoutDirection() == Qt::LeftToRight ? end(0) : home(0);
+    }
+    else if (event == QKeySequence::MoveToPreviousWord) {
+        if (echoMode() == Normal)
+            layoutDirection() == Qt::LeftToRight ? cursorWordBackward(0) : cursorWordForward(0);
+        else if (!d->readOnly) {
+            layoutDirection() == Qt::LeftToRight ? home(0) : end(0);
+        }
+    }
+    else if (event == QKeySequence::SelectNextWord) {
+        if (echoMode() == Normal)
+            layoutDirection() == Qt::LeftToRight ? cursorWordForward(1) : cursorWordBackward(1);
+        else
+            layoutDirection() == Qt::LeftToRight ? end(1) : home(1);
+    }
+    else if (event == QKeySequence::SelectPreviousWord) {
+        if (echoMode() == Normal)
+            layoutDirection() == Qt::LeftToRight ? cursorWordBackward(1) : cursorWordForward(1);
+        else
+            layoutDirection() == Qt::LeftToRight ? home(1) : end(1);
+    }
+    else if (event == QKeySequence::Delete) {
+        if (!d->readOnly)
+            del();
+    }
+    else if (event == QKeySequence::DeleteEndOfWord) {
+        if (!d->readOnly) {
+            cursorWordForward(true);
+            del();
+        }
+    }
+    else if (event == QKeySequence::DeleteStartOfWord) {
+        if (!d->readOnly) {
+            cursorWordBackward(true);
+            del();
+        }
+    }
+#endif // QT_NO_SHORTCUT
+    else {
+#ifdef Q_WS_MAC
+        if (event->key() == Qt::Key_Up || event->key() == Qt::Key_Down) {
+            Qt::KeyboardModifiers myModifiers = (event->modifiers() & ~Qt::KeypadModifier);
+            if (myModifiers & Qt::ShiftModifier) {
+                if (myModifiers == (Qt::ControlModifier|Qt::ShiftModifier)
+                        || myModifiers == (Qt::AltModifier|Qt::ShiftModifier)
+                        || myModifiers == Qt::ShiftModifier) {
+                    event->key() == Qt::Key_Up ? home(1) : end(1);
+                }
+            } else {
+                if ((myModifiers == Qt::ControlModifier
+                     || myModifiers == Qt::AltModifier
+                     || myModifiers == Qt::NoModifier)) {
+                    event->key() == Qt::Key_Up ? home(0) : end(0);
+                }
+            }
+        }
+#endif
+        if (event->modifiers() & Qt::ControlModifier) {
+            switch (event->key()) {
+            case Qt::Key_Backspace:
+                if (!d->readOnly) {
+                    cursorWordBackward(true);
+                    del();
+                }
+                break;
+#ifndef QT_NO_COMPLETER
+            case Qt::Key_Up:
+            case Qt::Key_Down:
+                d->complete(event->key());
+                break;
+#endif
+#if defined(Q_WS_X11)
+            case Qt::Key_E:
+                end(0);
+                break;
+            case Qt::Key_U:
+                if (!d->readOnly) {
+                    setSelection(0, d->text.size());
+#ifndef QT_NO_CLIPBOARD
+                    copy();
+#endif
+                    del();
+                }
+            break;
+#endif
+            default:
+                unknown = true;
+            }
+        } else { // ### check for *no* modifier
+            switch (event->key()) {
+            case Qt::Key_Backspace:
+                if (!d->readOnly) {
+                    backspace();
+#ifndef QT_NO_COMPLETER
+                    d->complete(Qt::Key_Backspace);
+#endif
+                }
+                break;
+#ifdef QT_KEYPAD_NAVIGATION
+            case Qt::Key_Back:
+                if (QApplication::keypadNavigationEnabled() && !event->isAutoRepeat()
+                    && !isReadOnly()) {
+                    if (text().length() == 0) {
+                        setText(d->origText);
+                        if (d->passwordEchoEditing)
+                            d->updatePasswordEchoEditing(false);
+                        setEditFocus(false);
+                    } else if (!d->deleteAllTimer.isActive()) {
+                        d->deleteAllTimer.start(750, this);
+                    }
+                } else {
+                    unknown = true;
+                }
+                break;
+#endif
+            default:
+                unknown = true;
+            }
+        }
+    }
+    if (event->key() == Qt::Key_Direction_L || event->key() == Qt::Key_Direction_R) {
+        setLayoutDirection((event->key() == Qt::Key_Direction_L) ? Qt::LeftToRight : Qt::RightToLeft);
+        d->updateTextLayout();
+        update();
+        unknown = false;
+    }
+    if (unknown && !d->readOnly) {
+        QString t = event->text();
+        if (!t.isEmpty() && t.at(0).isPrint()) {
+            insert(t);
+#ifndef QT_NO_COMPLETER
+            d->complete(event->key());
+#endif
+            event->accept();
+            return;
+        }
+    }
+    if (unknown)
+        event->ignore();
+    else
+        event->accept();
+    d->control->processKeyEvent(event);
+    if (event->isAccepted())
+        d->control->setCursorBlinkPeriod(0);
+}
 …
     Q_D(const QLineEdit);
     return d->cursorRect();
+}
-/*!
-  This function is not intended as polymorphic usage. Just a shared code
-  fragment that calls QInputContext::mouseHandler for this
-  class.
-*/
-bool QLineEditPrivate::sendMouseEventToInputContext( QMouseEvent *e )
+{
-#if !defined QT_NO_IM
-    Q_Q(QLineEdit);
-    if ( composeMode() ) {
-        int tmp_cursor = xToPos(e->pos().x());
-        int mousePos = tmp_cursor - cursor;
-        if ( mousePos < 0 || mousePos > textLayout.preeditAreaText().length() ) {
-            mousePos = -1;
-            // don't send move events outside the preedit area
-            if ( e->type() == QEvent::MouseMove )
-                return true;
+        }
-        QInputContext *qic = q->inputContext();
-        if ( qic )
-            // may be causing reset() in some input methods
-            qic->mouseHandler(mousePos, e);
-        if (!textLayout.preeditAreaText().isEmpty())
-            return true;
+    }
-#else
-    Q_UNUSED(e);
-#endif
-    return false;
+}
 …
+{
     Q_D(QLineEdit);
     if (d->readOnly) {
+    if (d->control->isReadOnly()) {
         e->ignore();
         return;
+    }
     if (echoMode() == PasswordEchoOnEdit && !d->passwordEchoEditing) {
+    if (echoMode() == PasswordEchoOnEdit && !d->control->passwordEchoEditing()) {
         // Clear the edit and reset to normal echo mode while entering input
         // method data; the echo mode switches back when the edit loses focus.
 …
         && !e->preeditString().isEmpty()) {
         setEditFocus(true);
+#ifndef Q_OS_SYMBIAN
         selectAll();        // so text is replaced rather than appended to
+    }
+#endif
+    int priorState = d->undoState;
+    d->removeSelectedText();
+    int c = d->cursor; // cursor position after insertion of commit string
+    if (e->replacementStart() <= 0)
+        c += e->commitString().length() + qMin(-e->replacementStart(), e->replacementLength());
+    d->cursor += e->replacementStart();
+    // insert commit string
+    if (e->replacementLength()) {
+        d->selstart = d->cursor;
+        d->selend = d->selstart + e->replacementLength();
+        d->removeSelectedText();
+    }
+    if (!e->commitString().isEmpty())
+        d->insert(e->commitString());
+    d->cursor = qMin(c, d->text.length());
+    d->textLayout.setPreeditArea(d->cursor, e->preeditString());
+    d->preeditCursor = e->preeditString().length();
+    d->hideCursor = false;
+    QList<QTextLayout::FormatRange> formats;
+    for (int i = 0; i < e->attributes().size(); ++i) {
+        const QInputMethodEvent::Attribute &a = e->attributes().at(i);
+        if (a.type == QInputMethodEvent::Cursor) {
+            d->preeditCursor = a.start;
+            d->hideCursor = !a.length;
+        } else if (a.type == QInputMethodEvent::TextFormat) {
+            QTextCharFormat f = qvariant_cast<QTextFormat>(a.value).toCharFormat();
+            if (f.isValid()) {
+                QTextLayout::FormatRange o;
+                o.start = a.start + d->cursor;
+                o.length = a.length;
+                o.format = f;
+                formats.append(o);
+            }
+        }
+    }
+    d->textLayout.setAdditionalFormats(formats);
+    d->updateTextLayout();
+    update();
+    if (!e->commitString().isEmpty())
+        d->emitCursorPositionChanged();
+    d->finishChange(priorState);
+#endif
+    }
+#endif
+    d->control->processInputMethodEvent(e);
 #ifndef QT_NO_COMPLETER
     if (!e->commitString().isEmpty())
         d->complete(Qt::Key_unknown);
+        d->control->complete(Qt::Key_unknown);
 #endif
+}
 …
         return font();
     case Qt::ImCursorPosition:
         return QVariant((d->selend - d->selstart == 0) ? d->cursor : d->selend);
+        return QVariant(d->control->cursor());
     case Qt::ImSurroundingText:
         return QVariant(d->text);
+        return QVariant(text());
     case Qt::ImCurrentSelection:
         return QVariant(selectedText());
+    case Qt::ImMaximumTextLength:
+        return QVariant(maxLength());
+    case Qt::ImAnchorPosition:
+        if (d->control->selectionStart() == d->control->selectionEnd())
+            return QVariant(d->control->cursor());
+        else if (d->control->selectionStart() == d->control->cursor())
+            return QVariant(d->control->selectionEnd());
+        else
+            return QVariant(d->control->selectionStart());
     default:
         return QVariant();
 …
          e->reason() == Qt::BacktabFocusReason  ||
          e->reason() == Qt::ShortcutFocusReason) {
         if (d->maskData)
             d->moveCursor(d->nextMaskBlank(0));
         else if (!d->hasSelectedText())
+        if (!d->control->inputMask().isEmpty())
+            d->control->moveCursor(d->control->nextMaskBlank(0));
+        else if (!d->control->hasSelectedText())
             selectAll();
+    } else if (e->reason() == Qt::MouseFocusReason) {
+        d->clickCausedFocus = 1;
+    }
 #ifdef QT_KEYPAD_NAVIGATION
+    if (!QApplication::keypadNavigationEnabled() || (hasEditFocus() && e->reason() == Qt::PopupFocusReason))
+#endif
+    if (!d->cursorTimer) {
+        int cft = QApplication::cursorFlashTime();
+        d->cursorTimer = cft ? startTimer(cft/2) : -1;
+    }
+    if (!QApplication::keypadNavigationEnabled() || (hasEditFocus() && ( e->reason() == Qt::PopupFocusReason
+#ifdef Q_OS_SYMBIAN
+            || e->reason() == Qt::ActiveWindowFocusReason
+#endif
+            ))) {
+#endif
+    d->control->setCursorBlinkPeriod(QApplication::cursorFlashTime());
     QStyleOptionFrameV2 opt;
     initStyleOption(&opt);
     if((!hasSelectedText() && d->textLayout.preeditAreaText().isEmpty())
+    if((!hasSelectedText() && d->control->preeditAreaText().isEmpty())
        || style()->styleHint(QStyle::SH_BlinkCursorWhenTextSelected, &opt, this))
         d->setCursorVisible(true);
 #ifdef Q_WS_MAC
     if (d->echoMode == Password || d->echoMode == NoEcho)
+    if (d->control->echoMode() == Password || d->control->echoMode() == NoEcho)
         qt_mac_secure_keyboard(true);
 #endif
 #ifdef QT_KEYPAD_NAVIGATION
+    d->origText = d->text;
+        d->control->setCancelText(d->control->text());
+    }
 #endif
 #ifndef QT_NO_COMPLETER
     if (d->completer) {
         d->completer->setWidget(this);
         QObject::connect(d->completer, SIGNAL(activated(QString)),
+    if (d->control->completer()) {
+        d->control->completer()->setWidget(this);
+        QObject::connect(d->control->completer(), SIGNAL(activated(QString)),
                          this, SLOT(setText(QString)));
         QObject::connect(d->completer, SIGNAL(highlighted(QString)),
+        QObject::connect(d->control->completer(), SIGNAL(highlighted(QString)),
                          this, SLOT(_q_completionHighlighted(QString)));
+    }
 …
+{
     Q_D(QLineEdit);
     if (d->passwordEchoEditing) {
+    if (d->control->passwordEchoEditing()) {
         // Reset the echomode back to PasswordEchoOnEdit when the widget loses
         // focus.
 …
     d->setCursorVisible(false);
+    if (d->cursorTimer > 0)
+        killTimer(d->cursorTimer);
+    d->cursorTimer = 0;
+    d->control->setCursorBlinkPeriod(0);
 #ifdef QT_KEYPAD_NAVIGATION
     // editingFinished() is already emitted on LeaveEditFocus
 …
     if (reason != Qt::PopupFocusReason
         || !(QApplication::activePopupWidget() && QApplication::activePopupWidget()->parentWidget() == this)) {
+        if (!d->emitingEditingFinished) {
+            if (hasAcceptableInput() || d->fixup()) {
+                d->emitingEditingFinished = true;
+            if (hasAcceptableInput() || d->control->fixup())
                 emit editingFinished();
-                d->emitingEditingFinished = false;
+            }
+        }
 #ifdef QT3_SUPPORT
         emit lostFocus();
 …
+    }
 #ifdef Q_WS_MAC
     if (d->echoMode == Password || d->echoMode == NoEcho)
+    if (d->control->echoMode() == Password || d->control->echoMode() == NoEcho)
         qt_mac_secure_keyboard(false);
 #endif
 #ifdef QT_KEYPAD_NAVIGATION
     d->origText = QString();
+    d->control->setCancelText(QString());
 #endif
 #ifndef QT_NO_COMPLETER
     if (d->completer) {
         QObject::disconnect(d->completer, 0, this, 0);
+    if (d->control->completer()) {
+        QObject::disconnect(d->control->completer(), 0, this, 0);
+    }
 #endif
 …
     switch (va & Qt::AlignVertical_Mask) {
      case Qt::AlignBottom:
          d->vscroll = r.y() + r.height() - fm.height() - verticalMargin;
+         d->vscroll = r.y() + r.height() - fm.height() - d->verticalMargin;
          break;
      case Qt::AlignTop:
          d->vscroll = r.y() + verticalMargin;
+         d->vscroll = r.y() + d->verticalMargin;
          break;
      default:
 …
          break;
+    }
+    QRect lineRect(r.x() + horizontalMargin, d->vscroll, r.width() - 2*horizontalMargin, fm.height());
+    QTextLine line = d->textLayout.lineAt(0);
+    int cursor = d->cursor;
+    if (d->preeditCursor != -1)
+        cursor += d->preeditCursor;
+    // locate cursor position
+    int cix = qRound(line.cursorToX(cursor));
+    QRect lineRect(r.x() + d->horizontalMargin, d->vscroll, r.width() - 2*d->horizontalMargin, fm.height());
+    if (d->control->text().isEmpty()) {
+        if (!hasFocus() && !d->placeholderText.isEmpty()) {
+            QColor col = pal.text().color();
+            col.setAlpha(128);
+            QPen oldpen = p.pen();
+            p.setPen(col);
+            p.drawText(lineRect, va, d->placeholderText);
+            p.setPen(oldpen);
+            return;
+        }
+    }
+    int cix = qRound(d->control->cursorToX());
     // horizontal scrolling. d->hscroll is the left indent from the beginning
 …
     int minLB = qMax(0, -fm.minLeftBearing());
     int minRB = qMax(0, -fm.minRightBearing());
     int widthUsed = qRound(line.naturalTextWidth()) + 1 + minRB;
+    int widthUsed = qRound(d->control->naturalTextWidth()) + 1 + minRB;
     if ((minLB + widthUsed) <=  lineRect.width()) {
         // text fits in lineRect; use hscroll for alignment
 …
+    }
     // the y offset is there to keep the baseline constant in case we have script changes in the text.
     QPoint topLeft = lineRect.topLeft() - QPoint(d->hscroll, d->ascent - fm.ascent());
+    QPoint topLeft = lineRect.topLeft() - QPoint(d->hscroll, d->control->ascent() - fm.ascent());
     // draw text, selections and cursors
 #ifndef QT_NO_STYLE_STYLESHEET
     if (QStyleSheetStyle* cssStyle = qobject_cast<QStyleSheetStyle*>(style())) {
         cssStyle->focusPalette(this, &panel, &pal);
+        cssStyle->styleSheetPalette(this, &panel, &pal);
+    }
 #endif
     p.setPen(pal.text().color());
+    QVector<QTextLayout::FormatRange> selections;
+    int flags = QLineControl::DrawText;
 #ifdef QT_KEYPAD_NAVIGATION
     if (!QApplication::keypadNavigationEnabled() || hasEditFocus())
 #endif
+    if (d->selstart < d->selend || (d->cursorVisible && d->maskData && !d->readOnly)) {
+        QTextLayout::FormatRange o;
+        if (d->selstart < d->selend) {
+            o.start = d->selstart;
+            o.length = d->selend - d->selstart;
+            o.format.setBackground(pal.brush(QPalette::Highlight));
+            o.format.setForeground(pal.brush(QPalette::HighlightedText));
+        } else {
+            // mask selection
+            o.start = d->cursor;
+            o.length = 1;
+            o.format.setBackground(pal.brush(QPalette::Text));
+            o.format.setForeground(pal.brush(QPalette::Window));
+        }
+        selections.append(o);
+    if (d->control->hasSelectedText() || (d->cursorVisible && !d->control->inputMask().isEmpty() && !d->control->isReadOnly())){
+        flags |= QLineControl::DrawSelections;
+        // Palette only used for selections/mask and may not be in sync
+        if(d->control->palette() != pal)
+            d->control->setPalette(pal);
+    }
 …
     // selection phase of input method, so the ordinary cursor should be
     // invisible if we have a preedit string.
+    d->textLayout.draw(&p, topLeft, selections, r);
+    if (d->cursorVisible && !d->readOnly && !d->hideCursor)
+        d->textLayout.drawCursor(&p, topLeft, cursor, style()->pixelMetric(QStyle::PM_TextCursorWidth));
+    if (d->cursorVisible && !d->control->isReadOnly())
+        flags |= QLineControl::DrawCursor;
+    d->control->setCursorWidth(style()->pixelMetric(QStyle::PM_TextCursorWidth));
+    d->control->draw(&p, topLeft, r, flags);
+}
 …
+{
     Q_D(QLineEdit);
     if (!d->readOnly && e->mimeData()->hasFormat(QLatin1String("text/plain"))) {
+    if (!d->control->isReadOnly() && e->mimeData()->hasFormat(QLatin1String("text/plain"))) {
         e->acceptProposedAction();
         d->cursor = d->xToPos(e->pos().x());
+        d->control->moveCursor(d->xToPos(e->pos().x()), false);
         d->cursorVisible = true;
         update();
-        d->emitCursorPositionChanged();
+    }
+}
 …
     QString str = e->mimeData()->text();
     if (!str.isNull() && !d->readOnly) {
+    if (!str.isNull() && !d->control->isReadOnly()) {
         if (e->source() == this && e->dropAction() == Qt::CopyAction)
             deselect();
+        d->cursor =d->xToPos(e->pos().x());
+        int selStart = d->cursor;
+        int oldSelStart = d->selstart;
+        int oldSelEnd = d->selend;
+        int cursorPos = d->xToPos(e->pos().x());
+        int selStart = cursorPos;
+        int oldSelStart = d->control->selectionStart();
+        int oldSelEnd = d->control->selectionEnd();
+        d->control->moveCursor(cursorPos, false);
         d->cursorVisible = false;
         e->acceptProposedAction();
 …
+}
-void QLineEditPrivate::drag()
+{
-    Q_Q(QLineEdit);
-    dndTimer.stop();
-    QMimeData *data = new QMimeData;
-    data->setText(q->selectedText());
-    QDrag *drag = new QDrag(q);
-    drag->setMimeData(data);
-    Qt::DropAction action = drag->start();
-    if (action == Qt::MoveAction && !readOnly && drag->target() != q) {
-        int priorState = undoState;
-        removeSelectedText();
-        finishChange(priorState);
+    }
+}
 #endif // QT_NO_DRAGANDDROP
 …
     QMenu *popup = new QMenu(this);
     popup->setObjectName(QLatin1String("qt_edit_menu"));
+    QAction *action = popup->addAction(QLineEdit::tr("&Undo") + ACCEL_KEY(QKeySequence::Undo));
+    action->setEnabled(d->isUndoAvailable());
+    connect(action, SIGNAL(triggered()), SLOT(undo()));
+    action = popup->addAction(QLineEdit::tr("&Redo") + ACCEL_KEY(QKeySequence::Redo));
+    action->setEnabled(d->isRedoAvailable());
+    connect(action, SIGNAL(triggered()), SLOT(redo()));
+    popup->addSeparator();
+    QAction *action = 0;
+    if (!isReadOnly()) {
+        action = popup->addAction(QLineEdit::tr("&Undo") + ACCEL_KEY(QKeySequence::Undo));
+        action->setEnabled(d->control->isUndoAvailable());
+        connect(action, SIGNAL(triggered()), SLOT(undo()));
+        action = popup->addAction(QLineEdit::tr("&Redo") + ACCEL_KEY(QKeySequence::Redo));
+        action->setEnabled(d->control->isRedoAvailable());
+        connect(action, SIGNAL(triggered()), SLOT(redo()));
+        popup->addSeparator();
+    }
 #ifndef QT_NO_CLIPBOARD
+    action = popup->addAction(QLineEdit::tr("Cu&t") + ACCEL_KEY(QKeySequence::Cut));
+    action->setEnabled(!d->readOnly && d->hasSelectedText());
+    connect(action, SIGNAL(triggered()), SLOT(cut()));
+    if (!isReadOnly()) {
+        action = popup->addAction(QLineEdit::tr("Cu&t") + ACCEL_KEY(QKeySequence::Cut));
+        action->setEnabled(!d->control->isReadOnly() && d->control->hasSelectedText()
+                && d->control->echoMode() == QLineEdit::Normal);
+        connect(action, SIGNAL(triggered()), SLOT(cut()));
+    }
     action = popup->addAction(QLineEdit::tr("&Copy") + ACCEL_KEY(QKeySequence::Copy));
+    action->setEnabled(d->hasSelectedText());
+    action->setEnabled(d->control->hasSelectedText()
+            && d->control->echoMode() == QLineEdit::Normal);
     connect(action, SIGNAL(triggered()), SLOT(copy()));
+    action = popup->addAction(QLineEdit::tr("&Paste") + ACCEL_KEY(QKeySequence::Paste));
+    action->setEnabled(!d->readOnly && !QApplication::clipboard()->text().isEmpty());
+    connect(action, SIGNAL(triggered()), SLOT(paste()));
+#endif
+    action = popup->addAction(QLineEdit::tr("Delete"));
+    action->setEnabled(!d->readOnly && !d->text.isEmpty() && d->hasSelectedText());
+    connect(action, SIGNAL(triggered()), SLOT(_q_deleteSelected()));
+    popup->addSeparator();
+    if (!isReadOnly()) {
+        action = popup->addAction(QLineEdit::tr("&Paste") + ACCEL_KEY(QKeySequence::Paste));
+        action->setEnabled(!d->control->isReadOnly() && !QApplication::clipboard()->text().isEmpty());
+        connect(action, SIGNAL(triggered()), SLOT(paste()));
+    }
+#endif
+    if (!isReadOnly()) {
+        action = popup->addAction(QLineEdit::tr("Delete"));
+        action->setEnabled(!d->control->isReadOnly() && !d->control->text().isEmpty() && d->control->hasSelectedText());
+        connect(action, SIGNAL(triggered()), d->control, SLOT(_q_deleteSelected()));
+    }
+    if (!popup->isEmpty())
+        popup->addSeparator();
     action = popup->addAction(QLineEdit::tr("Select All") + ACCEL_KEY(QKeySequence::SelectAll));
     action->setEnabled(!d->text.isEmpty() && !d->allSelected());
+    action->setEnabled(!d->control->text().isEmpty() && !d->control->allSelected());
     d->selectAllAction = action;
     connect(action, SIGNAL(triggered()), SLOT(selectAll()));
 …
 #if defined(Q_WS_WIN)
     if (!d->readOnly && qt_use_rtl_extensions) {
+    if (!d->control->isReadOnly() && qt_use_rtl_extensions) {
 #else
     if (!d->readOnly) {
+    if (!d->control->isReadOnly()) {
 #endif
         popup->addSeparator();
 …
+{
     Q_D(QLineEdit);
+    if(ev->type() == QEvent::ActivationChange) {
+    switch(ev->type())
+    {
+    case QEvent::ActivationChange:
         if (!palette().isEqual(QPalette::Active, QPalette::Inactive))
             update();
+    } else if (ev->type() == QEvent::FontChange
+               || ev->type() == QEvent::StyleChange
+               || ev->type() == QEvent::LayoutDirectionChange) {
+        d->updateTextLayout();
+    }
+    QWidget::changeEvent(ev);
+}
+void QLineEditPrivate::_q_clipboardChanged()
+{
+}
+void QLineEditPrivate::_q_handleWindowActivate()
+{
+    Q_Q(QLineEdit);
+    if (!q->hasFocus() && q->hasSelectedText())
+        q->deselect();
+}
+void QLineEditPrivate::_q_deleteSelected()
+{
+    Q_Q(QLineEdit);
+    if (!hasSelectedText())
+        return;
+    int priorState = undoState;
+    q->resetInputContext();
+    removeSelectedText();
+    separate();
+    finishChange(priorState);
+}
+void QLineEditPrivate::init(const QString& txt)
+{
+    Q_Q(QLineEdit);
+#ifndef QT_NO_CURSOR
+    q->setCursor(Qt::IBeamCursor);
+#endif
+    q->setFocusPolicy(Qt::StrongFocus);
+    q->setAttribute(Qt::WA_InputMethodEnabled);
+    //   Specifies that this widget can use more, but is able to survive on
+    //   less, horizontal space; and is fixed vertically.
+    q->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed, QSizePolicy::LineEdit));
+    q->setBackgroundRole(QPalette::Base);
+    q->setAttribute(Qt::WA_KeyCompression);
+    q->setMouseTracking(true);
+    q->setAcceptDrops(true);
+    text = txt;
+    updateTextLayout();
+    cursor = text.length();
+    q->setAttribute(Qt::WA_MacShowFocusRect);
+}
+void QLineEditPrivate::updatePasswordEchoEditing(bool editing)
+{
+    Q_Q(QLineEdit);
+    passwordEchoEditing = editing;
+    q->setAttribute(Qt::WA_InputMethodEnabled, shouldEnableInputMethod(q));
+    updateTextLayout();
+    q->update();
+}
+void QLineEditPrivate::updateTextLayout()
+{
+    // replace certain non-printable characters with spaces (to avoid
+    // drawing boxes when using fonts that don't have glyphs for such
+    // characters)
+    Q_Q(QLineEdit);
+    QString str = q->displayText();
+    QChar* uc = str.data();
+    for (int i = 0; i < (int)str.length(); ++i) {
+        if ((uc[i] < 0x20 && uc[i] != 0x09)
+            || uc[i] == QChar::LineSeparator
+            || uc[i] == QChar::ParagraphSeparator
+            || uc[i] == QChar::ObjectReplacementCharacter)
+            uc[i] = QChar(0x0020);
+    }
+    textLayout.setFont(q->font());
+    textLayout.setText(str);
+    QTextOption option;
+    option.setTextDirection(q->layoutDirection());
+    option.setFlags(QTextOption::IncludeTrailingSpaces);
+    textLayout.setTextOption(option);
+    textLayout.beginLayout();
+    QTextLine l = textLayout.createLine();
+    textLayout.endLayout();
+    ascent = qRound(l.ascent());
+}
+int QLineEditPrivate::xToPos(int x, QTextLine::CursorPosition betweenOrOn) const
+{
+    QRect cr = adjustedContentsRect();
+    x-= cr.x() - hscroll + horizontalMargin;
+    QTextLine l = textLayout.lineAt(0);
+    return l.xToCursor(x, betweenOrOn);
+}
+QRect QLineEditPrivate::cursorRect() const
+{
+    Q_Q(const QLineEdit);
+    QRect cr = adjustedContentsRect();
+    int cix = cr.x() - hscroll + horizontalMargin;
+    QTextLine l = textLayout.lineAt(0);
+    int c = cursor;
+    if (preeditCursor != -1)
+        c += preeditCursor;
+    cix += qRound(l.cursorToX(c));
+    int ch = qMin(cr.height(), q->fontMetrics().height() + 1);
+    int w = q->style()->pixelMetric(QStyle::PM_TextCursorWidth);
+    return QRect(cix-5, vscroll, w + 9, ch);
+}
+QRect QLineEditPrivate::adjustedContentsRect() const
+{
+    Q_Q(const QLineEdit);
+    QStyleOptionFrameV2 opt;
+    q->initStyleOption(&opt);
+    QRect r = q->style()->subElementRect(QStyle::SE_LineEditContents, &opt, q);
+    r.setX(r.x() + leftTextMargin);
+    r.setY(r.y() + topTextMargin);
+    r.setRight(r.right() - rightTextMargin);
+    r.setBottom(r.bottom() - bottomTextMargin);
+    return r;
+}
+bool QLineEditPrivate::fixup() // this function assumes that validate currently returns != Acceptable
+{
+#ifndef QT_NO_VALIDATOR
+    if (validator) {
+        QString textCopy = text;
+        int cursorCopy = cursor;
+        validator->fixup(textCopy);
+        if (validator->validate(textCopy, cursorCopy) == QValidator::Acceptable) {
+            if (textCopy != text || cursorCopy != cursor)
+                setText(textCopy, cursorCopy);
+            return true;
+        break;
+    case QEvent::FontChange:
+        d->control->setFont(font());
+        break;
+    case QEvent::StyleChange:
+        {
+            QStyleOptionFrameV2 opt;
+            initStyleOption(&opt);
+            d->control->setPasswordCharacter(style()->styleHint(QStyle::SH_LineEdit_PasswordCharacter, &opt, this));
+        }
+    }
+#endif
+    return false;
+}
+void QLineEditPrivate::moveCursor(int pos, bool mark)
+{
+    Q_Q(QLineEdit);
+    if (pos != cursor) {
+        separate();
+        if (maskData)
+            pos = pos > cursor ? nextMaskBlank(pos) : prevMaskBlank(pos);
+    }
+    bool fullUpdate = mark || hasSelectedText();
+    if (mark) {
+        int anchor;
+        if (selend > selstart && cursor == selstart)
+            anchor = selend;
+        else if (selend > selstart && cursor == selend)
+            anchor = selstart;
+        else
+            anchor = cursor;
+        selstart = qMin(anchor, pos);
+        selend = qMax(anchor, pos);
+        updateTextLayout();
+    } else {
+        deselect();
+    }
+    if (fullUpdate) {
+        cursor = pos;
+        q->update();
+    } else {
+        setCursorVisible(false);
+        cursor = pos;
+        setCursorVisible(true);
+        if (!adjustedContentsRect().contains(cursorRect()))
+            q->update();
+    }
+    QStyleOptionFrameV2 opt;
+    q->initStyleOption(&opt);
+    if (mark && !q->style()->styleHint(QStyle::SH_BlinkCursorWhenTextSelected, &opt, q))
+        setCursorVisible(false);
+    if (mark || selDirty) {
+        selDirty = false;
+        emit q->selectionChanged();
+    }
+    emitCursorPositionChanged();
+}
+void QLineEditPrivate::finishChange(int validateFromState, bool update, bool edited)
+{
+    Q_Q(QLineEdit);
+    bool lineDirty = selDirty;
+    if (textDirty) {
+        // do validation
+        bool wasValidInput = validInput;
+        validInput = true;
+#ifndef QT_NO_VALIDATOR
+        if (validator) {
+            validInput = false;
+            QString textCopy = text;
+            int cursorCopy = cursor;
+            validInput = (validator->validate(textCopy, cursorCopy) != QValidator::Invalid);
+            if (validInput) {
+                if (text != textCopy) {
+                    setText(textCopy, cursorCopy);
+                    return;
+                }
+                cursor = cursorCopy;
+            }
+        }
+#endif
+        if (validateFromState >= 0 && wasValidInput && !validInput) {
+            undo(validateFromState);
+            history.resize(undoState);
+            if (modifiedState > undoState)
+                modifiedState = -1;
+            validInput = true;
+            textDirty = false;
+        }
+        updateTextLayout();
+        lineDirty |= textDirty;
+        if (textDirty) {
+            textDirty = false;
+            QString actualText = maskData ? stripString(text) : text;
+            if (edited)
+                emit q->textEdited(actualText);
+            q->updateMicroFocus();
+#ifndef QT_NO_COMPLETER
+            if (edited && completer && completer->completionMode() != QCompleter::InlineCompletion)
+                complete(-1); // update the popup on cut/paste/del
+#endif
+            emit q->textChanged(actualText);
+        }
+#ifndef QT_NO_ACCESSIBILITY
+        QAccessible::updateAccessibility(q, 0, QAccessible::ValueChanged);
+#endif
+    }
+    if (selDirty) {
+        selDirty = false;
+        emit q->selectionChanged();
+    }
+    if (lineDirty || update)
+        q->update();
+    emitCursorPositionChanged();
+}
+void QLineEditPrivate::emitCursorPositionChanged()
+{
+    Q_Q(QLineEdit);
+    if (cursor != lastCursorPos) {
+        const int oldLast = lastCursorPos;
+        lastCursorPos = cursor;
+        emit q->cursorPositionChanged(oldLast, cursor);
+    }
+}
+void QLineEditPrivate::setText(const QString& txt, int pos, bool edited)
+{
+    Q_Q(QLineEdit);
+    q->resetInputContext();
+    deselect();
+    QString oldText = text;
+    if (maskData) {
+        text = maskString(0, txt, true);
+        text += clearString(text.length(), maxLength - text.length());
+    } else {
+        text = txt.isEmpty() ? txt : txt.left(maxLength);
+    }
+    history.clear();
+    modifiedState =  undoState = 0;
+    cursor = (pos < 0 || pos > text.length()) ? text.length() : pos;
+    textDirty = (oldText != text);
+    finishChange(-1, true, edited);
+}
+void QLineEditPrivate::setCursorVisible(bool visible)
+{
+    Q_Q(QLineEdit);
+    if ((bool)cursorVisible == visible)
+        return;
+    if (cursorTimer)
+        cursorVisible = visible;
+    QRect r = cursorRect();
+    if (maskData)
+        q->update();
+    else
+        q->update(r);
+}
+void QLineEditPrivate::addCommand(const Command& cmd)
+{
+    if (separator && undoState && history[undoState-1].type != Separator) {
+        history.resize(undoState + 2);
+        history[undoState++] = Command(Separator, cursor, 0, selstart, selend);
+    } else {
+        history.resize(undoState + 1);
+    }
+    separator = false;
+    history[undoState++] = cmd;
+}
+void QLineEditPrivate::insert(const QString& s)
+{
+    if (hasSelectedText())
+        addCommand(Command(SetSelection, cursor, 0, selstart, selend));
+    if (maskData) {
+        QString ms = maskString(cursor, s);
+        for (int i = 0; i < (int) ms.length(); ++i) {
+            addCommand (Command(DeleteSelection, cursor+i, text.at(cursor+i), -1, -1));
+            addCommand(Command(Insert, cursor+i, ms.at(i), -1, -1));
+        }
+        text.replace(cursor, ms.length(), ms);
+        cursor += ms.length();
+        cursor = nextMaskBlank(cursor);
+        textDirty = true;
+    } else {
+        int remaining = maxLength - text.length();
+        if (remaining != 0) {
+            text.insert(cursor, s.left(remaining));
+            for (int i = 0; i < (int) s.left(remaining).length(); ++i)
+               addCommand(Command(Insert, cursor++, s.at(i), -1, -1));
+            textDirty = true;
+        }
+    }
+}
+void QLineEditPrivate::del(bool wasBackspace)
+{
+    if (cursor < (int) text.length()) {
+        if (hasSelectedText())
+            addCommand(Command(SetSelection, cursor, 0, selstart, selend));
+        addCommand (Command((CommandType)((maskData?2:0)+(wasBackspace?Remove:Delete)), cursor, text.at(cursor), -1, -1));
+        if (maskData) {
+            text.replace(cursor, 1, clearString(cursor, 1));
+            addCommand(Command(Insert, cursor, text.at(cursor), -1, -1));
+        } else {
+            text.remove(cursor, 1);
+        }
+        textDirty = true;
+    }
+}
+void QLineEditPrivate::removeSelectedText()
+{
+    if (selstart < selend && selend <= (int) text.length()) {
+        separate();
+        int i ;
+        addCommand(Command(SetSelection, cursor, 0, selstart, selend));
+        if (selstart <= cursor && cursor < selend) {
+            // cursor is within the selection. Split up the commands
+            // to be able to restore the correct cursor position
+            for (i = cursor; i >= selstart; --i)
+                addCommand (Command(DeleteSelection, i, text.at(i), -1, 1));
+            for (i = selend - 1; i > cursor; --i)
+                addCommand (Command(DeleteSelection, i - cursor + selstart - 1, text.at(i), -1, -1));
+        } else {
+            for (i = selend-1; i >= selstart; --i)
+                addCommand (Command(RemoveSelection, i, text.at(i), -1, -1));
+        }
+        if (maskData) {
+            text.replace(selstart, selend - selstart,  clearString(selstart, selend - selstart));
+            for (int i = 0; i < selend - selstart; ++i)
+                addCommand(Command(Insert, selstart + i, text.at(selstart + i), -1, -1));
+        } else {
+            text.remove(selstart, selend - selstart);
+        }
+        if (cursor > selstart)
+            cursor -= qMin(cursor, selend) - selstart;
+        deselect();
+        textDirty = true;
+        // adjust hscroll to avoid gap
+        const int minRB = qMax(0, -q_func()->fontMetrics().minRightBearing());
+        updateTextLayout();
+        const QTextLine line = textLayout.lineAt(0);
+        const int widthUsed = qRound(line.naturalTextWidth()) + 1 + minRB;
+        hscroll = qMin(hscroll, widthUsed);
+    }
+}
+void QLineEditPrivate::parseInputMask(const QString &maskFields)
+{
+    int delimiter = maskFields.indexOf(QLatin1Char(';'));
+    if (maskFields.isEmpty() || delimiter == 0) {
+        if (maskData) {
+            delete [] maskData;
+            maskData = 0;
+            maxLength = 32767;
+            setText(QString());
+        }
+        return;
+    }
+    if (delimiter == -1) {
+        blank = QLatin1Char(' ');
+        inputMask = maskFields;
+    } else {
+        inputMask = maskFields.left(delimiter);
+        blank = (delimiter + 1 < maskFields.length()) ? maskFields[delimiter + 1] : QLatin1Char(' ');
+    }
+    // calculate maxLength / maskData length
+    maxLength = 0;
+    QChar c = 0;
+    for (int i=0; i<inputMask.length(); i++) {
+        c = inputMask.at(i);
+        if (i > 0 && inputMask.at(i-1) == QLatin1Char('\\')) {
+            maxLength++;
+            continue;
+        }
+        if (c != QLatin1Char('\\') && c != QLatin1Char('!') &&
+             c != QLatin1Char('<') && c != QLatin1Char('>') &&
+             c != QLatin1Char('{') && c != QLatin1Char('}') &&
+             c != QLatin1Char('[') && c != QLatin1Char(']'))
+            maxLength++;
+    }
+    delete [] maskData;
+    maskData = new MaskInputData[maxLength];
+    MaskInputData::Casemode m = MaskInputData::NoCaseMode;
+    c = 0;
+    bool s;
+    bool escape = false;
+    int index = 0;
+    for (int i = 0; i < inputMask.length(); i++) {
+        c = inputMask.at(i);
+        if (escape) {
+            s = true;
+            maskData[index].maskChar = c;
+            maskData[index].separator = s;
+            maskData[index].caseMode = m;
+            index++;
+            escape = false;
+        } else if (c == QLatin1Char('<')) {
+                m = MaskInputData::Lower;
+        } else if (c == QLatin1Char('>')) {
+            m = MaskInputData::Upper;
+        } else if (c == QLatin1Char('!')) {
+            m = MaskInputData::NoCaseMode;
+        } else if (c != QLatin1Char('{') && c != QLatin1Char('}') && c != QLatin1Char('[') && c != QLatin1Char(']')) {
+            switch (c.unicode()) {
+            case 'A':
+            case 'a':
+            case 'N':
+            case 'n':
+            case 'X':
+            case 'x':
+            case '9':
+            case '0':
+            case 'D':
+            case 'd':
+            case '#':
+            case 'H':
+            case 'h':
+            case 'B':
+            case 'b':
+                s = false;
+                break;
+            case '\\':
+                escape = true;
+            default:
+                s = true;
+                break;
+            }
+            if (!escape) {
+                maskData[index].maskChar = c;
+                maskData[index].separator = s;
+                maskData[index].caseMode = m;
+                index++;
+            }
+        }
+    }
+    setText(text);
+}
+/* checks if the key is valid compared to the inputMask */
+bool QLineEditPrivate::isValidInput(QChar key, QChar mask) const
+{
+    switch (mask.unicode()) {
+    case 'A':
+        if (key.isLetter())
+            return true;
+        update();
         break;
+    case 'a':
+        if (key.isLetter() || key == blank)
+            return true;
+        break;
+    case 'N':
+        if (key.isLetterOrNumber())
+            return true;
+        break;
+    case 'n':
+        if (key.isLetterOrNumber() || key == blank)
+            return true;
+        break;
+    case 'X':
+        if (key.isPrint())
+            return true;
+        break;
+    case 'x':
+        if (key.isPrint() || key == blank)
+            return true;
+        break;
+    case '9':
+        if (key.isNumber())
+            return true;
+        break;
+    case '0':
+        if (key.isNumber() || key == blank)
+            return true;
+        break;
+    case 'D':
+        if (key.isNumber() && key.digitValue() > 0)
+            return true;
+        break;
+    case 'd':
+        if ((key.isNumber() && key.digitValue() > 0) || key == blank)
+            return true;
+        break;
+    case '#':
+        if (key.isNumber() || key == QLatin1Char('+') || key == QLatin1Char('-') || key == blank)
+            return true;
+        break;
+    case 'B':
+        if (key == QLatin1Char('0') || key == QLatin1Char('1'))
+            return true;
+        break;
+    case 'b':
+        if (key == QLatin1Char('0') || key == QLatin1Char('1') || key == blank)
+            return true;
+        break;
+    case 'H':
+        if (key.isNumber() || (key >= QLatin1Char('a') && key <= QLatin1Char('f')) || (key >= QLatin1Char('A') && key <= QLatin1Char('F')))
+            return true;
+        break;
+    case 'h':
+        if (key.isNumber() || (key >= QLatin1Char('a') && key <= QLatin1Char('f')) || (key >= QLatin1Char('A') && key <= QLatin1Char('F')) || key == blank)
+            return true;
+    case QEvent::LayoutDirectionChange:
+        d->control->setLayoutDirection(layoutDirection());
         break;
     default:
         break;
+    }
+    return false;
+}
+bool QLineEditPrivate::hasAcceptableInput(const QString &str) const
+{
+#ifndef QT_NO_VALIDATOR
+    QString textCopy = str;
+    int cursorCopy = cursor;
+    if (validator && validator->validate(textCopy, cursorCopy)
+        != QValidator::Acceptable)
+        return false;
+#endif
+    if (!maskData)
+        return true;
+    if (str.length() != maxLength)
+        return false;
+    for (int i=0; i < maxLength; ++i) {
+        if (maskData[i].separator) {
+            if (str.at(i) != maskData[i].maskChar)
+                return false;
+        } else {
+            if (!isValidInput(str.at(i), maskData[i].maskChar))
+                return false;
+        }
+    }
+    return true;
+}
+/*
+  Applies the inputMask on \a str starting from position \a pos in the mask. \a clear
+  specifies from where characters should be gotten when a separator is met in \a str - true means
+  that blanks will be used, false that previous input is used.
+  Calling this when no inputMask is set is undefined.
+*/
+QString QLineEditPrivate::maskString(uint pos, const QString &str, bool clear) const
+{
+    if (pos >= (uint)maxLength)
+        return QString::fromLatin1("");
+    QString fill;
+    fill = clear ? clearString(0, maxLength) : text;
+    int strIndex = 0;
+    QString s = QString::fromLatin1("");
+    int i = pos;
+    while (i < maxLength) {
+        if (strIndex < str.length()) {
+            if (maskData[i].separator) {
+                s += maskData[i].maskChar;
+                if (str[(int)strIndex] == maskData[i].maskChar)
+                    strIndex++;
+                ++i;
+            } else {
+                if (isValidInput(str[(int)strIndex], maskData[i].maskChar)) {
+                    switch (maskData[i].caseMode) {
+                    case MaskInputData::Upper:
+                        s += str[(int)strIndex].toUpper();
+                        break;
+                    case MaskInputData::Lower:
+                        s += str[(int)strIndex].toLower();
+                        break;
+                    default:
+                        s += str[(int)strIndex];
+                    }
+                    ++i;
+                } else {
+                    // search for separator first
+                    int n = findInMask(i, true, true, str[(int)strIndex]);
+                    if (n != -1) {
+                        if (str.length() != 1 || i == 0 || (i > 0 && (!maskData[i-1].separator || maskData[i-1].maskChar != str[(int)strIndex]))) {
+                            s += fill.mid(i, n-i+1);
+                            i = n + 1; // update i to find + 1
+                        }
+                    } else {
+                        // search for valid blank if not
+                        n = findInMask(i, true, false, str[(int)strIndex]);
+                        if (n != -1) {
+                            s += fill.mid(i, n-i);
+                            switch (maskData[n].caseMode) {
+                            case MaskInputData::Upper:
+                                s += str[(int)strIndex].toUpper();
+                                break;
+                            case MaskInputData::Lower:
+                                s += str[(int)strIndex].toLower();
+                                break;
+                            default:
+                                s += str[(int)strIndex];
+                            }
+                            i = n + 1; // updates i to find + 1
+                        }
+                    }
+                }
+                strIndex++;
+            }
+        } else
+            break;
+    }
+    return s;
+}
+/*
+  Returns a "cleared" string with only separators and blank chars.
+  Calling this when no inputMask is set is undefined.
+*/
+QString QLineEditPrivate::clearString(uint pos, uint len) const
+{
+    if (pos >= (uint)maxLength)
+        return QString();
+    QString s;
+    int end = qMin((uint)maxLength, pos + len);
+    for (int i=pos; i<end; i++)
+        if (maskData[i].separator)
+            s += maskData[i].maskChar;
+        else
+            s += blank;
+    return s;
+}
+/*
+  Strips blank parts of the input in a QLineEdit when an inputMask is set,
+  separators are still included. Typically "127.0__.0__.1__" becomes "127.0.0.1".
+*/
+QString QLineEditPrivate::stripString(const QString &str) const
+{
+    if (!maskData)
+        return str;
+    QString s;
+    int end = qMin(maxLength, (int)str.length());
+    for (int i=0; i < end; i++)
+        if (maskData[i].separator)
+            s += maskData[i].maskChar;
+        else
+            if (str[i] != blank)
+                s += str[i];
+    return s;
+}
+/* searches forward/backward in maskData for either a separator or a blank */
+int QLineEditPrivate::findInMask(int pos, bool forward, bool findSeparator, QChar searchChar) const
+{
+    if (pos >= maxLength || pos < 0)
+        return -1;
+    int end = forward ? maxLength : -1;
+    int step = forward ? 1 : -1;
+    int i = pos;
+    while (i != end) {
+        if (findSeparator) {
+            if (maskData[i].separator && maskData[i].maskChar == searchChar)
+                return i;
+        } else {
+            if (!maskData[i].separator) {
+                if (searchChar.isNull())
+                    return i;
+                else if (isValidInput(searchChar, maskData[i].maskChar))
+                    return i;
+            }
+        }
+        i += step;
+    }
+    return -1;
+}
+void QLineEditPrivate::undo(int until)
+{
+    if (!isUndoAvailable())
+        return;
+    deselect();
+    while (undoState && undoState > until) {
+        Command& cmd = history[--undoState];
+        switch (cmd.type) {
+        case Insert:
+            text.remove(cmd.pos, 1);
+            cursor = cmd.pos;
+            break;
+        case SetSelection:
+            selstart = cmd.selStart;
+            selend = cmd.selEnd;
+            cursor = cmd.pos;
+            break;
+        case Remove:
+        case RemoveSelection:
+            text.insert(cmd.pos, cmd.uc);
+            cursor = cmd.pos + 1;
+            break;
+        case Delete:
+        case DeleteSelection:
+            text.insert(cmd.pos, cmd.uc);
+            cursor = cmd.pos;
+            break;
+        case Separator:
+            continue;
+        }
+        if (until < 0 && undoState) {
+            Command& next = history[undoState-1];
+            if (next.type != cmd.type && next.type < RemoveSelection
+                 && (cmd.type < RemoveSelection || next.type == Separator))
+                break;
+        }
+    }
+    textDirty = true;
+    emitCursorPositionChanged();
+}
+void QLineEditPrivate::redo() {
+    if (!isRedoAvailable())
+        return;
+    deselect();
+    while (undoState < (int)history.size()) {
+        Command& cmd = history[undoState++];
+        switch (cmd.type) {
+        case Insert:
+            text.insert(cmd.pos, cmd.uc);
+            cursor = cmd.pos + 1;
+            break;
+        case SetSelection:
+            selstart = cmd.selStart;
+            selend = cmd.selEnd;
+            cursor = cmd.pos;
+            break;
+        case Remove:
+        case Delete:
+        case RemoveSelection:
+        case DeleteSelection:
+            text.remove(cmd.pos, 1);
+            cursor = cmd.pos;
+            break;
+        case Separator:
+            selstart = cmd.selStart;
+            selend = cmd.selEnd;
+            cursor = cmd.pos;
+            break;
+        }
+        if (undoState < (int)history.size()) {
+            Command& next = history[undoState];
+            if (next.type != cmd.type && cmd.type < RemoveSelection && next.type != Separator
+                 && (next.type < RemoveSelection || cmd.type == Separator))
+                break;
+        }
+    }
+    textDirty = true;
+    emitCursorPositionChanged();
+    QWidget::changeEvent(ev);
+}
 …
 /*!
     \fn int QLineEdit::margin() const
     Returns the with of the the margin around the contents of the widget.
+    Returns the width of the margin around the contents of the widget.
     Use QWidget::getContentsMargins() instead.

trunk/src/gui/widgets/qlineedit.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #include <QtGui/qframe.h>
 #include <QtCore/qstring.h>
+#include <QtCore/qmargins.h>
 QT_BEGIN_HEADER
 …
     Q_PROPERTY(bool redoAvailable READ isRedoAvailable)
     Q_PROPERTY(bool acceptableInput READ hasAcceptableInput)
+// ### Qt 4.7: remove this #if guard
+#if (QT_VERSION >= 0x407000) || defined(Q_WS_MAEMO_5)
+    Q_PROPERTY(QString placeholderText READ placeholderText WRITE setPlaceholderText)
+#endif
 public:
 …
     QString displayText() const;
+// ### Qt 4.7: remove this #if guard
+#if (QT_VERSION >= 0x407000) || defined(Q_WS_MAEMO_5)
+    QString placeholderText() const;
+    void setPlaceholderText(const QString &);
+#endif
     int maxLength() const;
 …
     void setTextMargins(int left, int top, int right, int bottom);
+    void setTextMargins(const QMargins &margins);
     void getTextMargins(int *left, int *top, int *right, int *bottom) const;
+    QMargins textMargins() const;
 public Q_SLOTS:
 …
     Q_DISABLE_COPY(QLineEdit)
     Q_DECLARE_PRIVATE(QLineEdit)
-    Q_PRIVATE_SLOT(d_func(), void _q_clipboardChanged())
     Q_PRIVATE_SLOT(d_func(), void _q_handleWindowActivate())
+    Q_PRIVATE_SLOT(d_func(), void _q_deleteSelected())
+    Q_PRIVATE_SLOT(d_func(), void _q_textEdited(const QString &))
+    Q_PRIVATE_SLOT(d_func(), void _q_cursorPositionChanged(int, int))
 #ifndef QT_NO_COMPLETER
     Q_PRIVATE_SLOT(d_func(), void _q_completionHighlighted(QString))
 #endif
+#ifdef QT_KEYPAD_NAVIGATION
+    Q_PRIVATE_SLOT(d_func(), void _q_editFocusChange(bool))
+#endif
+    Q_PRIVATE_SLOT(d_func(), void _q_selectionChanged())
 };

trunk/src/gui/widgets/qlineedit_p.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #include "QtGui/qlineedit.h"
+#include "private/qlinecontrol_p.h"
 QT_BEGIN_NAMESPACE
 …
     QLineEditPrivate()
+        : cursor(0), preeditCursor(0), cursorTimer(0), frame(1),
+          cursorVisible(0), hideCursor(false), separator(0), readOnly(0),
+          dragEnabled(0), contextMenuEnabled(1), echoMode(0), textDirty(0),
+          selDirty(0), validInput(1), alignment(Qt::AlignLeading | Qt::AlignVCenter), ascent(0),
+          maxLength(32767), hscroll(0), vscroll(0), lastCursorPos(-1), maskData(0),
+          modifiedState(0), undoState(0), selstart(0), selend(0), userInput(false),
+          emitingEditingFinished(false), passwordEchoEditing(false)
+#ifndef QT_NO_COMPLETER
+        , completer(0)
+#endif
+        , leftTextMargin(0), topTextMargin(0), rightTextMargin(0), bottomTextMargin(0)
+        {
+        }
+        : control(0), frame(1), contextMenuEnabled(1), cursorVisible(0),
+        dragEnabled(0), clickCausedFocus(0), hscroll(0), vscroll(0),
+        alignment(Qt::AlignLeading | Qt::AlignVCenter),
+        leftTextMargin(0), topTextMargin(0), rightTextMargin(0), bottomTextMargin(0)
+    {
+    }
     ~QLineEditPrivate()
+    {
         delete [] maskData;
+        delete control;
+    }
-    void init(const QString&);
+    QString text;
+    int cursor;
+    int preeditCursor;
+    int cursorTimer; // -1 for non blinking cursor.
+    QPoint tripleClick;
+    QBasicTimer tripleClickTimer;
+    uint frame : 1;
+    uint cursorVisible : 1;
+    uint hideCursor : 1; // used to hide the cursor inside preedit areas
+    uint separator : 1;
+    uint readOnly : 1;
+    uint dragEnabled : 1;
+    uint contextMenuEnabled : 1;
+    uint echoMode : 2;
+    uint textDirty : 1;
+    uint selDirty : 1;
+    uint validInput : 1;
+    uint alignment;
+    int ascent;
+    int maxLength;
+    int hscroll;
+    int vscroll;
+    int lastCursorPos;
+    QLineControl *control;
 #ifndef QT_NO_CONTEXTMENU
     QPointer<QAction> selectAllAction;
 #endif
+    void init(const QString&);
+    inline void emitCursorPositionChanged();
+    bool sendMouseEventToInputContext(QMouseEvent *e);
+    int xToPos(int x, QTextLine::CursorPosition = QTextLine::CursorBetweenCharacters) const;
+    QRect cursorRect() const;
+    void setCursorVisible(bool visible);
     void finishChange(int validateFromState = -1, bool update = false, bool edited = true);
+    void updatePasswordEchoEditing(bool);
+    QPointer<QValidator> validator;
+    struct MaskInputData {
+        enum Casemode { NoCaseMode, Upper, Lower };
+        QChar maskChar; // either the separator char or the inputmask
+        bool separator;
+        Casemode caseMode;
+    };
+    QString inputMask;
+    QChar blank;
+    MaskInputData *maskData;
+    inline int nextMaskBlank(int pos) {
+        int c = findInMask(pos, true, false);
+        separator |= (c != pos);
+        return (c != -1 ?  c : maxLength);
+    }
+    inline int prevMaskBlank(int pos) {
+        int c = findInMask(pos, false, false);
+        separator |= (c != pos);
+        return (c != -1 ? c : 0);
+    inline bool shouldEnableInputMethod() const
+    {
+        return !control->isReadOnly();
+    }
+    void setCursorVisible(bool visible);
+    QPoint tripleClick;
+    QBasicTimer tripleClickTimer;
+    uint frame : 1;
+    uint contextMenuEnabled : 1;
+    uint cursorVisible : 1;
+    uint dragEnabled : 1;
+    uint clickCausedFocus : 1;
+    int hscroll;
+    int vscroll;
+    uint alignment;
+    static const int verticalMargin;
+    static const int horizontalMargin;
+    // undo/redo handling
+    enum CommandType { Separator, Insert, Remove, Delete, RemoveSelection, DeleteSelection, SetSelection };
+    struct Command {
+        inline Command() {}
+        inline Command(CommandType t, int p, QChar c, int ss, int se) : type(t),uc(c),pos(p),selStart(ss),selEnd(se) {}
+        uint type : 4;
+        QChar uc;
+        int pos, selStart, selEnd;
+    };
+    int modifiedState;
+    int undoState;
+    QVector<Command> history;
+    void addCommand(const Command& cmd);
+    void insert(const QString& s);
+    void del(bool wasBackspace = false);
+    void remove(int pos);
+    inline void separate() { separator = true; }
+    void undo(int until = -1);
+    void redo();
+    inline bool isUndoAvailable() const { return !readOnly && undoState; }
+    inline bool isRedoAvailable() const { return !readOnly && undoState < (int)history.size(); }
+    // selection
+    int selstart, selend;
+    inline bool allSelected() const { return !text.isEmpty() && selstart == 0 && selend == (int)text.length(); }
+    inline bool hasSelectedText() const { return !text.isEmpty() && selend > selstart; }
+    inline void deselect() { selDirty |= (selend > selstart); selstart = selend = 0; }
+    void removeSelectedText();
+#ifndef QT_NO_CLIPBOARD
+    void copy(bool clipboard = true) const;
+#endif
+    inline bool inSelection(int x) const
+    { if (selstart >= selend) return false;
+    int pos = xToPos(x, QTextLine::CursorOnCharacter);  return pos >= selstart && pos < selend; }
+    // masking
+    void parseInputMask(const QString &maskFields);
+    bool isValidInput(QChar key, QChar mask) const;
+    bool hasAcceptableInput(const QString &text) const;
+    QString maskString(uint pos, const QString &str, bool clear = false) const;
+    QString clearString(uint pos, uint len) const;
+    QString stripString(const QString &str) const;
+    int findInMask(int pos, bool forward, bool findSeparator, QChar searchChar = QChar()) const;
+    // input methods
+    bool composeMode() const { return !textLayout.preeditAreaText().isEmpty(); }
+    // complex text layout
+    QTextLayout textLayout;
+    void updateTextLayout();
+    void moveCursor(int pos, bool mark = false);
+    void setText(const QString& txt, int pos = -1, bool edited = true);
+    int xToPos(int x, QTextLine::CursorPosition = QTextLine::CursorBetweenCharacters) const;
+    QRect cursorRect() const;
+    bool fixup();
+    bool sendMouseEventToInputContext(QMouseEvent *e);
     QRect adjustedContentsRect() const;
+    void _q_handleWindowActivate();
+    void _q_textEdited(const QString &);
+    void _q_cursorPositionChanged(int, int);
+#ifdef QT_KEYPAD_NAVIGATION
+    void _q_editFocusChange(bool);
+#endif
+    void _q_selectionChanged();
+#ifndef QT_NO_COMPLETER
+    void _q_completionHighlighted(QString);
+#endif
 #ifndef QT_NO_DRAGANDDROP
-    // drag and drop
     QPoint dndPos;
     QBasicTimer dndTimer;
     void drag();
-#endif
-    void _q_clipboardChanged();
-    void _q_handleWindowActivate();
-    void _q_deleteSelected();
-    bool userInput;
-    bool emitingEditingFinished;
-#ifdef QT_KEYPAD_NAVIGATION
-    QBasicTimer deleteAllTimer; // keypad navigation
-    QString origText;
-#endif
-    bool passwordEchoEditing;
-    void updatePasswordEchoEditing(bool editing);
-#ifndef QT_NO_COMPLETER
-    QPointer<QCompleter> completer;
-    void complete(int key = -1);
-    void _q_completionHighlighted(QString);
-    bool advanceToEnabledItem(int n);
 #endif
 …
     int rightTextMargin;
     int bottomTextMargin;
+    QString placeholderText;
 };

trunk/src/gui/widgets/qmaccocoaviewcontainer_mac.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/qmaccocoaviewcontainer_mac.mm

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ****************************************************************************/

trunk/src/gui/widgets/qmacnativewidget_mac.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 private:
     Q_DECLARE_PRIVATE_D(QWidget::d_ptr, QMacNativeWidget)
+    Q_DECLARE_PRIVATE(QMacNativeWidget)
 };

trunk/src/gui/widgets/qmacnativewidget_mac.mm

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ****************************************************************************/

trunk/src/gui/widgets/qmainwindow.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 QT_END_NAMESPACE
 #endif
+#ifdef QT_SOFTKEYS_ENABLED
+#include <private/qsoftkeymanager_p.h>
+#endif
 QT_BEGIN_NAMESPACE
 …
 public:
     inline QMainWindowPrivate()
         : layout(0), toolButtonStyle(Qt::ToolButtonIconOnly)
+        : layout(0), explicitIconSize(false), toolButtonStyle(Qt::ToolButtonIconOnly)
 #ifdef Q_WS_MAC
             , useHIToolBar(false)
+#endif
+#ifdef QT_SOFTKEYS_ENABLED
+            , menuBarAction(0)
 #endif
 #if !defined(QT_NO_DOCKWIDGET) && !defined(QT_NO_CURSOR)
 …
     bool useHIToolBar;
 #endif
+#ifdef QT_SOFTKEYS_ENABLED
+    QAction *menuBarAction;
+#endif
     void init();
     QList<int> hoverSeparator;
 …
     const int metric = q->style()->pixelMetric(QStyle::PM_ToolBarIconSize, 0, q);
     iconSize = QSize(metric, metric);
-    explicitIconSize = false;
     q->setAttribute(Qt::WA_Hover);
+#ifdef QT_SOFTKEYS_ENABLED
+    menuBarAction = QSoftKeyManager::createAction(QSoftKeyManager::MenuSoftKey, q);
+    menuBarAction->setObjectName(QLatin1String("_q_menuSoftKeyAction"));
+    menuBarAction->setVisible(false);
+#endif
+}
 …
     \brief The QMainWindow class provides a main application
            window.
     \ingroup application
+    \mainclass
+    \ingroup mainwindow-classes
     \tableofcontents
 …
         oldMenuBar->deleteLater();
+    }
-#ifdef Q_OS_WINCE
-    if (menuBar && menuBar->size().height() > 0)
-#endif
     d->layout->setMenuBar(menuBar);
+#ifdef QT_SOFTKEYS_ENABLED
+    if (menuBar)
+        addAction(d->menuBarAction);
+    else
+        removeAction(d->menuBarAction);
+#endif
+}
 …
 #ifndef QT_NO_TABBAR
 /*!
+/*!
     \property QMainWindow::documentMode
     \brief whether the tab bar for tabbed dockwidgets is set to document mode.
 …
 #ifndef QT_NO_TABWIDGET
 /*!
+/*!
     \property QMainWindow::tabShape
     \brief the tab shape used for tabbed dock widgets.
 …
     to restoreState(). Returns true if the state was restored; otherwise
     returns false.
+    \sa restoreState(), saveState()
 */
 …
     number to restoreState().
+    To save the geometry when the window closes, you can
+    implement a close event like this:
+    \snippet doc/src/snippets/code/src_gui_widgets_qmainwindow.cpp 0
     \sa restoreState(), QWidget::saveGeometry(), QWidget::restoreGeometry()
 */
 …
     is restored, and this function returns \c true.
+    \sa saveState(), QWidget::saveGeometry(), QWidget::restoreGeometry()
+    To restore geometry saved using QSettings, you can use code like
+    this:
+    \snippet doc/src/snippets/code/src_gui_widgets_qmainwindow.cpp 1
+    \sa saveState(), QWidget::saveGeometry(),
+    QWidget::restoreGeometry(), restoreDockWidget()
 */
 bool QMainWindow::restoreState(const QByteArray &state, int version)
 …
         case QEvent::Show:
             if (unifiedTitleAndToolBarOnMac())
+                macWindowToolbarShow(this, true);
+                d->layout->syncUnifiedToolbarVisibility();
+            d->layout->blockVisiblityCheck = false;
             break;
-#  ifdef QT_MAC_USE_COCOA
        case QEvent::WindowStateChange:
+            {
+                if (isHidden()) {
+                    // We are coming out of a minimize, leave things as is.
+                    d->layout->blockVisiblityCheck = true;
+                }
+#  ifdef QT_MAC_USE_COCOA
                 // We need to update the HIToolbar status when we go out of or into fullscreen.
                 QWindowStateChangeEvent *wce = static_cast<QWindowStateChangeEvent *>(event);
 …
                     d->layout->updateHIToolBarStatus();
+                }
+#  endif // Cocoa
+            }
             break;
+#  endif // Cocoa
+#endif
+#endif // Q_WS_MAC
 #if !defined(QT_NO_DOCKWIDGET) && !defined(QT_NO_CURSOR)
        case QEvent::CursorChange:
 …
            break;
 #endif
         default:
             break;
 …
     This property is false by default and only has any effect on Mac OS X 10.4 or higher.
     If set to true, then the top toolbar area is replaced with a Carbon
     HIToolbar and all toolbars in the top toolbar area are moved to that. Any
     toolbars added afterwards will also be added to the Carbon HIToolbar. This
     means a couple of things.
+    If set to true, then the top toolbar area is replaced with a Carbon HIToolbar
+    or a Cocoa NSToolbar (depending on whether Qt was built with Carbon or Cocoa).
+    All toolbars in the top toolbar area and any toolbars added afterwards are
+    moved to that. This means a couple of things.
     \list
 …
     \i Any custom widgets in the toolbar will not be shown if the toolbar
         becomes too small (only actions will be shown)
+    \i If you call showFullScreen() on the main window, the QToolbar will
+        disappear since it is considered to be part of the title bar. You can
+        work around this by turning off the unified toolbar before you call
+    \i Before Qt 4.5, if you called showFullScreen() on the main window, the QToolbar would
+        disappear since it is considered to be part of the title bar. Qt 4.5 and up will now work around this by pulling
+        the toolbars out and back into the regular toolbar and vice versa when you swap out.
+        However, a good practice would be that turning off the unified toolbar before you call
         showFullScreen() and restoring it after you call showNormal().
     \endlist

trunk/src/gui/widgets/qmainwindow.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/qmainwindowlayout.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
         QMainWindowLayout *layout = qobject_cast<QMainWindowLayout*>(mainWindow->layout());
         Q_ASSERT(layout != 0);
         layout->widgetAnimator->animate(centralWidgetItem->widget(), centralWidgetRect, animated);
+        layout->widgetAnimator.animate(centralWidgetItem->widget(), centralWidgetRect, animated);
+    }
 #endif
 …
+}
 bool QMainWindowLayoutState::insertGap(QList<int> path, QLayoutItem *item)
+bool QMainWindowLayoutState::insertGap(const QList<int> &path, QLayoutItem *item)
+{
     if (path.isEmpty())
         return false;
     int i = path.takeFirst();
+    int i = path.first();
 #ifndef QT_NO_TOOLBAR
     if (i == 0) {
         Q_ASSERT(qobject_cast<QToolBar*>(item->widget()) != 0);
         return toolBarAreaLayout.insertGap(path, item);
+        return toolBarAreaLayout.insertGap(path.mid(1), item);
+    }
 #endif
 …
     if (i == 1) {
         Q_ASSERT(qobject_cast<QDockWidget*>(item->widget()) != 0);
         return dockAreaLayout.insertGap(path, item);
+        return dockAreaLayout.insertGap(path.mid(1), item);
+    }
 #endif //QT_NO_DOCKWIDGET
 …
+}
 void QMainWindowLayoutState::remove(QList<int> path)
+{
     int i = path.takeFirst();
+void QMainWindowLayoutState::remove(const QList<int> &path)
+{
+    int i = path.first();
 #ifndef QT_NO_TOOLBAR
     if (i == 0)
         toolBarAreaLayout.remove(path);
+        toolBarAreaLayout.remove(path.mid(1));
 #endif
 #ifndef QT_NO_DOCKWIDGET
     if (i == 1)
         dockAreaLayout.remove(path);
+        dockAreaLayout.remove(path.mid(1));
 #endif //QT_NO_DOCKWIDGET
+}
 …
     dockAreaLayout.clear();
 #else
     centralWidgetRect = QRect(0, 0, -1, -1);
 #endif
     rect = QRect(0, 0, -1, -1);
+    centralWidgetRect = QRect();
+#endif
+    rect = QRect();
+}
 …
+}
 QLayoutItem *QMainWindowLayoutState::item(QList<int> path)
+{
     int i = path.takeFirst();
+QLayoutItem *QMainWindowLayoutState::item(const QList<int> &path)
+{
+    int i = path.first();
 #ifndef QT_NO_TOOLBAR
     if (i == 0)
         return toolBarAreaLayout.item(path).widgetItem;
+        return toolBarAreaLayout.item(path.mid(1)).widgetItem;
 #endif
 #ifndef QT_NO_DOCKWIDGET
     if (i == 1)
         return dockAreaLayout.item(path).widgetItem;
+        return dockAreaLayout.item(path.mid(1)).widgetItem;
 #endif //QT_NO_DOCKWIDGET
 …
+}
 QRect QMainWindowLayoutState::itemRect(QList<int> path) const
+{
     int i = path.takeFirst();
+QRect QMainWindowLayoutState::itemRect(const QList<int> &path) const
+{
+    int i = path.first();
 #ifndef QT_NO_TOOLBAR
     if (i == 0)
         return toolBarAreaLayout.itemRect(path);
+        return toolBarAreaLayout.itemRect(path.mid(1));
 #endif
 #ifndef QT_NO_DOCKWIDGET
     if (i == 1)
         return dockAreaLayout.itemRect(path);
+        return dockAreaLayout.itemRect(path.mid(1));
 #endif //QT_NO_DOCKWIDGET
 …
+}
 QRect QMainWindowLayoutState::gapRect(QList<int> path) const
+{
     int i = path.takeFirst();
+QRect QMainWindowLayoutState::gapRect(const QList<int> &path) const
+{
+    int i = path.first();
 #ifndef QT_NO_TOOLBAR
     if (i == 0)
         return toolBarAreaLayout.itemRect(path);
+        return toolBarAreaLayout.itemRect(path.mid(1));
 #endif
 #ifndef QT_NO_DOCKWIDGET
     if (i == 1)
         return dockAreaLayout.gapRect(path);
+        return dockAreaLayout.gapRect(path.mid(1));
 #endif //QT_NO_DOCKWIDGET
 …
+}
 QLayoutItem *QMainWindowLayoutState::plug(QList<int> path)
+{
     int i = path.takeFirst();
+QLayoutItem *QMainWindowLayoutState::plug(const QList<int> &path)
+{
+    int i = path.first();
 #ifndef QT_NO_TOOLBAR
     if (i == 0)
         return toolBarAreaLayout.plug(path);
+        return toolBarAreaLayout.plug(path.mid(1));
 #endif
 #ifndef QT_NO_DOCKWIDGET
     if (i == 1)
         return dockAreaLayout.plug(path);
+        return dockAreaLayout.plug(path.mid(1));
 #endif //QT_NO_DOCKWIDGET
 …
+}
 QLayoutItem *QMainWindowLayoutState::unplug(QList<int> path, QMainWindowLayoutState *other)
+{
     int i = path.takeFirst();
+QLayoutItem *QMainWindowLayoutState::unplug(const QList<int> &path, QMainWindowLayoutState *other)
+{
+    int i = path.first();
 #ifdef QT_NO_TOOLBAR
 …
 #else
     if (i == 0)
         return toolBarAreaLayout.unplug(path, other ? &other->toolBarAreaLayout : 0);
+        return toolBarAreaLayout.unplug(path.mid(1), other ? &other->toolBarAreaLayout : 0);
 #endif
 #ifndef QT_NO_DOCKWIDGET
     if (i == 1)
         return dockAreaLayout.unplug(path);
+        return dockAreaLayout.unplug(path.mid(1));
 #endif //QT_NO_DOCKWIDGET
 …
 void QMainWindowLayout::toggleToolBarsVisible()
+{
+    layoutState.toolBarAreaLayout.visible = !layoutState.toolBarAreaLayout.visible;
+    if (!layoutState.mainWindow->isMaximized()){
+        QPoint topLeft = parentWidget()->geometry().topLeft();
+        QRect r = parentWidget()->geometry();
+        r = layoutState.toolBarAreaLayout.rectHint(r);
+        r.moveTo(topLeft);
+        parentWidget()->setGeometry(r);
+//      widgetAnimator->animate(parentWidget(), r, true);
+    } else{
+        update();
+    bool updateNonUnifiedParts = true;
+#ifdef Q_WS_MAC
+    if (layoutState.mainWindow->unifiedTitleAndToolBarOnMac()) {
+        // If we hit this case, someone has pressed the "toolbar button" which will
+        // toggle the unified toolbar visiblity, because that's what the user wants.
+        // We might be in a situation where someone has hidden all the toolbars
+        // beforehand (maybe in construction), but now they've hit this button and
+        // and are expecting the items to show. What do we do?
+        // 1) Check the visibility of all the toolbars, if one is visible, do nothing, this
+        //    preserves what people would expect (these toolbars were visible when I clicked last time).
+        // 2) If NONE are visible, then show them all. Again, this preserves the user expectation
+        //    of, "I want to see the toolbars." The user may get more toolbars than expected, but this
+        //    is better seeing nothing.
+        // Don't worry about any of this if we are going invisible. This does mean we may get
+        // into issues when switching into and out of fullscreen mode, but this is probably minor.
+        // If we ever need to do hiding, that would have to be taken care of after the unified toolbar
+        // has finished hiding.
+        // People can of course handle the QEvent::ToolBarChange event themselves and do
+        // WHATEVER they want if they don't like what we are doing (though the unified toolbar
+        // will fire regardless).
+        // Check if we REALLY need to update the geometry below. If we only have items in the
+        // unified toolbar, all the docks will be empty, so there's very little point
+        // in doing the geometry as Apple will do it (we also avoid flicker in Cocoa as well).
+        // FWIW, layoutState.toolBarAreaLayout.visible and the state of the unified toolbar
+        // visibility can get out of sync. I really don't think it's a big issue. It is kept
+        // to a minimum because we only change the visibility if we absolutely must.
+        // update the "non unified parts."
+        updateNonUnifiedParts = !layoutState.toolBarAreaLayout.isEmpty();
+        // We get this function before the unified toolbar does its thing.
+        // So, the value will be opposite of what we expect.
+        bool goingVisible = !macWindowToolbarIsVisible(qt_mac_window_for(layoutState.mainWindow));
+        if (goingVisible) {
+            const int ToolBarCount = qtoolbarsInUnifiedToolbarList.size();
+            bool needAllVisible = true;
+            for (int i = 0; i < ToolBarCount; ++i) {
+                if (!qtoolbarsInUnifiedToolbarList.at(i)->isHidden()) {
+                    needAllVisible = false;
+                    break;
+                }
+            }
+            if (needAllVisible) {
+                QBoolBlocker blocker(blockVisiblityCheck);  // Disable the visibilty check because
+                                                            // the toggle has already happened.
+                for (int i = 0; i < ToolBarCount; ++i)
+                    qtoolbarsInUnifiedToolbarList.at(i)->setVisible(true);
+            }
+        }
+        if (!updateNonUnifiedParts)
+            layoutState.toolBarAreaLayout.visible = goingVisible;
+    }
+#endif
+    if (updateNonUnifiedParts) {
+        layoutState.toolBarAreaLayout.visible = !layoutState.toolBarAreaLayout.visible;
+        if (!layoutState.mainWindow->isMaximized()) {
+            QPoint topLeft = parentWidget()->geometry().topLeft();
+            QRect r = parentWidget()->geometry();
+            r = layoutState.toolBarAreaLayout.rectHint(r);
+            r.moveTo(topLeft);
+            parentWidget()->setGeometry(r);
+        } else {
+            update();
+        }
+    }
+}
 …
         return false;
     movingSeparatorPos = pos;
     separatorMoveTimer->start();
+    separatorMoveTimer.start(0, this);
     return true;
+}
-void QMainWindowLayout::doSeparatorMove()
+{
-    if (movingSeparator.isEmpty())
-        return;
-    if (movingSeparatorOrigin == movingSeparatorPos)
-        return;
-    layoutState = savedState;
-    layoutState.dockAreaLayout.separatorMove(movingSeparator, movingSeparatorOrigin,
-                                                movingSeparatorPos,
-                                                &separatorMoveCache);
-    movingSeparatorPos = movingSeparatorOrigin;
+}
 …
     movingSeparator.clear();
     savedState.clear();
-    separatorMoveCache.clear();
     return result;
+}
 …
         // the widget might in fact have been destroyed by now
         if (QWidget *w = ret->widget()) {
             widgetAnimator->abort(w);
+            widgetAnimator.abort(w);
             if (w == pluggingWidget)
                 pluggingWidget = 0;
 …
                   .expandedTo(statusbar->minimumSize()));
         sbr.moveBottom(r.bottom());
         QRect vr = QStyle::visualRect(QApplication::layoutDirection(), _r, sbr);
+        QRect vr = QStyle::visualRect(parentWidget()->layoutDirection(), _r, sbr);
         statusbar->setGeometry(vr);
         r.setBottom(sbr.top() - 1);
 …
     pluggingWidget = widget;
+    if (dockOptions & QMainWindow::AnimatedDocks) {
+        QRect globalRect = currentGapRect;
+        globalRect.moveTopLeft(parentWidget()->mapToGlobal(globalRect.topLeft()));
+#ifndef QT_NO_DOCKWIDGET
+        if (qobject_cast<QDockWidget*>(widget) != 0) {
+            QDockWidgetLayout *layout = qobject_cast<QDockWidgetLayout*>(widget->layout());
+            if (layout->nativeWindowDeco()) {
+                globalRect.adjust(0, layout->titleHeight(), 0, 0);
+            } else {
+                int fw = widget->style()->pixelMetric(QStyle::PM_DockWidgetFrameWidth, 0, widget);
+                globalRect.adjust(-fw, -fw, fw, fw);
+            }
+    QRect globalRect = currentGapRect;
+    globalRect.moveTopLeft(parentWidget()->mapToGlobal(globalRect.topLeft()));
+#ifndef QT_NO_DOCKWIDGET
+    if (qobject_cast<QDockWidget*>(widget) != 0) {
+        QDockWidgetLayout *layout = qobject_cast<QDockWidgetLayout*>(widget->layout());
+        if (layout->nativeWindowDeco()) {
+            globalRect.adjust(0, layout->titleHeight(), 0, 0);
+        } else {
+            int fw = widget->style()->pixelMetric(QStyle::PM_DockWidgetFrameWidth, 0, widget);
+            globalRect.adjust(-fw, -fw, fw, fw);
+        }
+#endif
+        widgetAnimator->animate(widget, globalRect,
+                                dockOptions & QMainWindow::AnimatedDocks);
+    } else {
+#ifndef QT_NO_DOCKWIDGET
+        if (QDockWidget *dw = qobject_cast<QDockWidget*>(widget))
+            dw->d_func()->plug(currentGapRect);
+#endif
+#ifndef QT_NO_TOOLBAR
+        if (QToolBar *tb = qobject_cast<QToolBar*>(widget))
+            tb->d_func()->plug(currentGapRect);
+#endif
+        applyState(layoutState);
+        savedState.clear();
+#ifndef QT_NO_DOCKWIDGET
+        parentWidget()->update(layoutState.dockAreaLayout.separatorRegion());
+#endif
+        currentGapPos.clear();
+        updateGapIndicator();
+        pluggingWidget = 0;
+    }
+    }
+#endif
+    widgetAnimator.animate(widget, globalRect, dockOptions & QMainWindow::AnimatedDocks);
     return true;
+}
-void QMainWindowLayout::allAnimationsFinished()
+{
-#ifndef QT_NO_DOCKWIDGET
-    parentWidget()->update(layoutState.dockAreaLayout.separatorRegion());
-#ifndef QT_NO_TABBAR
-    foreach (QTabBar *tab_bar, usedTabBars)
-        tab_bar->show();
-#endif // QT_NO_TABBAR
-#endif // QT_NO_DOCKWIDGET
-    updateGapIndicator();
+}
 void QMainWindowLayout::animationFinished(QWidget *widget)
+{
+    /* This signal is delivered from QWidgetAnimator over a qeued connection. The problem is that
+       the widget can be deleted. This is handled as follows:
+       The animator only ever animates widgets that have been added to this layout. If a widget
+       is deleted during animation, the widget's destructor removes the widget form this layout.
+       This in turn aborts the animation (see takeAt()) and this signal will never be delivered.
+       If the widget is deleted after the animation is finished but before this qeued signal
+       is delivered, the widget is no longer in the layout and we catch it here. The key is that
+       QMainWindowLayoutState::contains() never dereferences the pointer. */
+    if (!layoutState.contains(widget))
+        return;
+    //this function is called from within the Widget Animator whenever an animation is finished
+    //on a certain widget
 #ifndef QT_NO_TOOLBAR
     if (QToolBar *tb = qobject_cast<QToolBar*>(widget)) {
 …
 #endif
+    if (widget != pluggingWidget)
+        return;
+#ifndef QT_NO_DOCKWIDGET
+    if (QDockWidget *dw = qobject_cast<QDockWidget*>(widget))
+        dw->d_func()->plug(currentGapRect);
+#endif
+#ifndef QT_NO_TOOLBAR
+    if (QToolBar *tb = qobject_cast<QToolBar*>(widget))
+        tb->d_func()->plug(currentGapRect);
+#endif
+    applyState(layoutState, false);
+    if (widget == pluggingWidget) {
+#ifndef QT_NO_DOCKWIDGET
+        if (QDockWidget *dw = qobject_cast<QDockWidget*>(widget))
+            dw->d_func()->plug(currentGapRect);
+#endif
+#ifndef QT_NO_TOOLBAR
+        if (QToolBar *tb = qobject_cast<QToolBar*>(widget))
+            tb->d_func()->plug(currentGapRect);
+#endif
 #ifndef QT_NO_DOCKWIDGET
 #ifndef QT_NO_TABBAR
+    if (qobject_cast<QDockWidget*>(widget) != 0) {
+        // info() might return null if the widget is destroyed while
+        // animating but before the animationFinished signal is received.
+        if (QDockAreaLayoutInfo *info = layoutState.dockAreaLayout.info(widget))
+            info->setCurrentTab(widget);
+    }
+#endif
+#endif
+    savedState.clear();
+    currentGapPos.clear();
+    pluggingWidget = 0;
+        if (qobject_cast<QDockWidget*>(widget) != 0) {
+            // info() might return null if the widget is destroyed while
+            // animating but before the animationFinished signal is received.
+            if (QDockAreaLayoutInfo *info = layoutState.dockAreaLayout.info(widget))
+                info->setCurrentTab(widget);
+        }
+#endif
+#endif
+        savedState.clear();
+        currentGapPos.clear();
+        pluggingWidget = 0;
+        //applying the state will make sure that the currentGap is updated correctly
+        //and all the geometries (especially the one from the central widget) is correct
+        layoutState.apply(false);
+    }
+    if (!widgetAnimator.animating()) {
+        //all animations are finished
+#ifndef QT_NO_DOCKWIDGET
+        parentWidget()->update(layoutState.dockAreaLayout.separatorRegion());
+#ifndef QT_NO_TABBAR
+        foreach (QTabBar *tab_bar, usedTabBars)
+            tab_bar->show();
+#endif // QT_NO_TABBAR
+#endif // QT_NO_DOCKWIDGET
+    }
     updateGapIndicator();
+}
 …
 #endif
 #endif // QT_NO_DOCKWIDGET
+    , widgetAnimator(this)
+    , pluggingWidget(0)
+#ifndef QT_NO_RUBBERBAND
+    , gapIndicator(new QRubberBand(QRubberBand::Rectangle, mainwindow))
+#endif //QT_NO_RUBBERBAND
+#ifdef Q_WS_MAC
+    , blockVisiblityCheck(false)
+#endif
+{
 #ifndef QT_NO_DOCKWIDGET
 …
     sep = mainwindow->style()->pixelMetric(QStyle::PM_DockWidgetSeparatorExtent, 0, mainwindow);
 #endif
-    separatorMoveTimer = new QTimer(this);
-    separatorMoveTimer->setSingleShot(true);
-    separatorMoveTimer->setInterval(0);
-    connect(separatorMoveTimer, SIGNAL(timeout()), this, SLOT(doSeparatorMove()));
 #ifndef QT_NO_TABWIDGET
 …
 #ifndef QT_NO_RUBBERBAND
-    gapIndicator = new QRubberBand(QRubberBand::Rectangle, mainwindow);
     // For accessibility to identify this special widget.
     gapIndicator->setObjectName(QLatin1String("qt_rubberband"));
     gapIndicator->hide();
 #endif
 …
     setObjectName(mainwindow->objectName() + QLatin1String("_layout"));
-    widgetAnimator = new QWidgetAnimator(this);
-    connect(widgetAnimator, SIGNAL(finished(QWidget*)),
-            this, SLOT(animationFinished(QWidget*)), Qt::QueuedConnection);
-    connect(widgetAnimator, SIGNAL(finishedAll()),
-            this, SLOT(allAnimationsFinished()));
+}
 …
+{
 #ifndef QT_NO_RUBBERBAND
+    if (widgetAnimator->animating() || currentGapPos.isEmpty()) {
+        gapIndicator->hide();
+    } else {
+        if (gapIndicator->geometry() != currentGapRect)
+            gapIndicator->setGeometry(currentGapRect);
+        if (!gapIndicator->isVisible())
+            gapIndicator->show();
+    }
+    gapIndicator->setVisible(!widgetAnimator.animating() && !currentGapPos.isEmpty());
+    gapIndicator->setGeometry(currentGapRect);
 #endif
+}
 …
+}
+void QMainWindowLayout::timerEvent(QTimerEvent *e)
+{
+#ifndef QT_NO_DOCKWIDGET
+    if (e->timerId() == separatorMoveTimer.timerId()) {
+        //let's move the separators
+        separatorMoveTimer.stop();
+        if (movingSeparator.isEmpty())
+            return;
+        if (movingSeparatorOrigin == movingSeparatorPos)
+            return;
+        //when moving the separator, we need to update the previous position
+        parentWidget()->update(layoutState.dockAreaLayout.separatorRegion());
+        layoutState = savedState;
+        layoutState.dockAreaLayout.separatorMove(movingSeparator, movingSeparatorOrigin,
+                                                    movingSeparatorPos);
+        movingSeparatorPos = movingSeparatorOrigin;
+    }
+#endif
+    QLayout::timerEvent(e);
+}
 QT_END_NAMESPACE

trunk/src/gui/widgets/qmainwindowlayout_mac.mm

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
 ** This file contains pre-release code and may not be distributed.
 ** You may use this file in accordance with the terms and conditions
 ** contained in the either Technology Preview License Agreement or the
 ** Beta Release License Agreement.
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
 **
 ** GNU Lesser General Public License Usage
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ****************************************************************************/
 …
+{
     bool useMacToolbar = layoutState.mainWindow->unifiedTitleAndToolBarOnMac();
+    if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_4) {
+#ifndef QT_MAC_USE_COCOA
+        if (useMacToolbar) {
+            ChangeWindowAttributes(qt_mac_window_for(layoutState.mainWindow),
+                                   kWindowUnifiedTitleAndToolbarAttribute, 0);
+        } else {
+            ChangeWindowAttributes(qt_mac_window_for(layoutState.mainWindow),
+, kWindowUnifiedTitleAndToolbarAttribute);
+        }
+#endif
+        macWindowToolbarShow(layoutState.mainWindow, useMacToolbar);
+    }
+#ifndef QT_MAC_USE_COCOA
+    if (useMacToolbar) {
+        ChangeWindowAttributes(qt_mac_window_for(layoutState.mainWindow),
+                               kWindowUnifiedTitleAndToolbarAttribute, 0);
+    } else {
+        ChangeWindowAttributes(qt_mac_window_for(layoutState.mainWindow),
+, kWindowUnifiedTitleAndToolbarAttribute);
+    }
+#endif
     layoutState.mainWindow->setUpdatesEnabled(false);  // reduces a little bit of flicker, not all though
     if (!useMacToolbar) {
+        OSWindowRef windowRef = qt_mac_window_for(parentWidget());
+        macWindowToolbarShow(parentWidget(), false);
+        macWindowToolbarShow(layoutState.mainWindow, false);
         // Move everything out of the HIToolbar into the main toolbar.
         while (!qtoolbarsInUnifiedToolbarList.isEmpty()) {
 …
             layoutState.mainWindow->addToolBar(Qt::TopToolBarArea, qtoolbarsInUnifiedToolbarList.first());
+        }
         macWindowToolbarSet(windowRef, NULL);
+        macWindowToolbarSet(qt_mac_window_for(layoutState.mainWindow), 0);
     } else {
         QList<QToolBar *> toolbars = layoutState.mainWindow->findChildren<QToolBar *>();
 …
+            }
+        }
+        syncUnifiedToolbarVisibility();
+    }
     layoutState.mainWindow->setUpdatesEnabled(true);
 …
     NSString *toolbarID = kQToolBarNSToolbarIdentifier;
     toolbarID = [toolbarID stringByAppendingFormat:@"%p", toolbar];
     cocoaItemIDToToolbarHash.insert(QCFString::toQString(CFStringRef(toolbarID)), toolbar);
+    cocoaItemIDToToolbarHash.insert(qt_mac_NSStringToQString(toolbarID), toolbar);
     [macToolbar insertItemWithItemIdentifier:toolbarID atIndex:beforeIndex];
 #endif
 …
             [[qt_mac_window_for(layoutState.mainWindow->window()) toolbar]
                 removeItemAtIndex:toolbarItemsCopy.indexOf(item)];
-            // In Carbon this hash and list gets emptied via events. In Cocoa, we have to do it ourselves here.
-            it = unifiedToolbarHash.erase(it);
-            qtoolbarsInUnifiedToolbarList.removeAll(toolbar);
 #endif
             break;
 …
 void QMainWindowLayout::fixSizeInUnifiedToolbar(QToolBar *tb) const
+{
+#ifdef QT_MAC_USE_COCOA
     QHash<void *, QToolBar *>::const_iterator it = unifiedToolbarHash.constBegin();
     NSToolbarItem *item = nil;
 …
         QWidgetItem layoutItem(tb);
         QSize size = layoutItem.maximumSize();
         NSSize nssize = NSMakeSize(size.width(), size.height());
+        NSSize nssize = NSMakeSize(size.width(), size.height() - 2);
         [item setMaxSize:nssize];
         size = layoutItem.minimumSize();
         nssize.width = size.width();
         nssize.height = size.height();
+        nssize.height = size.height() - 2;
         [item setMinSize:nssize];
+    }
+}
+#else
+    Q_UNUSED(tb);
+#endif
+}
+void QMainWindowLayout::syncUnifiedToolbarVisibility()
+{
+    if (blockVisiblityCheck)
+        return;
+    Q_ASSERT(layoutState.mainWindow->unifiedTitleAndToolBarOnMac());
+    bool show = false;
+    const int ToolBarCount = qtoolbarsInUnifiedToolbarList.count();
+    for (int i = 0; i < ToolBarCount; ++i) {
+        if (qtoolbarsInUnifiedToolbarList.at(i)->isVisible()) {
+            show = true;
+            break;
+        }
+    }
+    macWindowToolbarShow(layoutState.mainWindow, show);
+}
 QT_END_NAMESPACE

trunk/src/gui/widgets/qmainwindowlayout_p.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #include "QtCore/qvector.h"
 #include "QtCore/qset.h"
+#include "QtCore/qbasictimer.h"
 #include "private/qlayoutengine_p.h"
+#include "private/qwidgetanimator_p.h"
 #include "qdockarealayout_p.h"
 …
 class QToolBar;
-class QWidgetAnimator;
 class QRubberBand;
 …
     QLayoutItem *takeAt(int index, int *x);
     QList<int> indexOf(QWidget *widget) const;
     QLayoutItem *item(QList<int> path);
     QRect itemRect(QList<int> path) const;
     QRect gapRect(QList<int> path) const; // ### get rid of this, use itemRect() instead
+    QLayoutItem *item(const QList<int> &path);
+    QRect itemRect(const QList<int> &path) const;
+    QRect gapRect(const QList<int> &path) const; // ### get rid of this, use itemRect() instead
     bool contains(QWidget *widget) const;
 …
     QList<int> gapIndex(QWidget *widget, const QPoint &pos) const;
     bool insertGap(QList<int> path, QLayoutItem *item);
     void remove(QList<int> path);
+    bool insertGap(const QList<int> &path, QLayoutItem *item);
+    void remove(const QList<int> &path);
     void remove(QLayoutItem *item);
     void clear();
     bool isValid() const;
     QLayoutItem *plug(QList<int> path);
     QLayoutItem *unplug(QList<int> path, QMainWindowLayoutState *savedState = 0);
+    QLayoutItem *plug(const QList<int> &path);
+    QLayoutItem *unplug(const QList<int> &path, QMainWindowLayoutState *savedState = 0);
     void saveState(QDataStream &stream) const;
 …
     void setDockOptions(QMainWindow::DockOptions opts);
     bool usesHIToolBar(QToolBar *toolbar) const;
+    void timerEvent(QTimerEvent *e);
     // status bar
 …
     QList<int> movingSeparator;
     QPoint movingSeparatorOrigin, movingSeparatorPos;
+    QTimer *separatorMoveTimer;
+    QVector<QLayoutStruct> separatorMoveCache;
+    QBasicTimer separatorMoveTimer;
     bool startSeparatorMove(const QPoint &pos);
 …
     // animations
     QWidgetAnimator *widgetAnimator;
+    QWidgetAnimator widgetAnimator;
     QList<int> currentGapPos;
     QRect currentGapRect;
 …
     void restore(bool keepSavedState = false);
     void updateHIToolBarStatus();
-private slots:
     void animationFinished(QWidget *widget);
+    void allAnimationsFinished();
+private Q_SLOTS:
 #ifndef QT_NO_DOCKWIDGET
-    void doSeparatorMove();
 #ifndef QT_NO_TABBAR
     void tabChanged();
 …
     void fixSizeInUnifiedToolbar(QToolBar *tb) const;
     bool useHIToolBar;
+    void syncUnifiedToolbarVisibility();
+    bool blockVisiblityCheck;
 #endif
 };
 …
 #endif // QT_NO_MAINWINDOW
-QT_BEGIN_NAMESPACE
-static inline int pick(Qt::Orientation o, const QPoint &pos)
-{ return o == Qt::Horizontal ? pos.x() : pos.y(); }
-static inline int pick(Qt::Orientation o, const QSize &size)
-{ return o == Qt::Horizontal ? size.width() : size.height(); }
-static inline int &rpick(Qt::Orientation o, QPoint &pos)
-{ return o == Qt::Horizontal ? pos.rx() : pos.ry(); }
-static inline int &rpick(Qt::Orientation o, QSize &size)
-{ return o == Qt::Horizontal ? size.rwidth() : size.rheight(); }
-static inline QSizePolicy::Policy pick(Qt::Orientation o, const QSizePolicy &policy)
-{ return o == Qt::Horizontal ? policy.horizontalPolicy() : policy.verticalPolicy(); }
-static inline int perp(Qt::Orientation o, const QPoint &pos)
-{ return o == Qt::Vertical ? pos.x() : pos.y(); }
-static inline int perp(Qt::Orientation o, const QSize &size)
-{ return o == Qt::Vertical ? size.width() : size.height(); }
-static inline int &rperp(Qt::Orientation o, QPoint &pos)
-{ return o == Qt::Vertical ? pos.rx() : pos.ry(); }
-static inline int &rperp(Qt::Orientation o, QSize &size)
-{ return o == Qt::Vertical ? size.rwidth() : size.rheight(); }
-QT_END_NAMESPACE
 #endif // QDYNAMICMAINWINDOWLAYOUT_P_H

trunk/src/gui/widgets/qmdiarea.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     \brief The QMdiArea widget provides an area in which MDI windows are displayed.
     \since 4.3
     \ingroup application
+    \mainclass
+    \ingroup mainwindow-classes
     QMdiArea functions, essentially, like a window manager for MDI
 …
     containing a list of windows, for example.
     The subwindows are sorted by the the current
+    The subwindows are sorted by the current
     \l{QMdiArea::}{WindowOrder}. This is used for the subWindowList()
     and for activateNextSubWindow() and acivatePreviousSubWindow().
 …
     Q_ASSERT(child && childWindows.indexOf(child) == -1);
     if (child->parent() != q->viewport())
         child->setParent(q->viewport(), child->windowFlags());
+    if (child->parent() != viewport)
+        child->setParent(viewport, child->windowFlags());
     childWindows.append(QPointer<QMdiSubWindow>(child));
     if (!child->testAttribute(Qt::WA_Resized) && q->isVisible()) {
         QSize newSize(child->sizeHint().boundedTo(q->viewport()->size()));
+        QSize newSize(child->sizeHint().boundedTo(viewport->size()));
         child->resize(newSize.expandedTo(qSmartMinSize(child)));
+    }
 …
     QObject::connect(child, SIGNAL(aboutToActivate()), q, SLOT(_q_deactivateAllWindows()));
     QObject::connect(child, SIGNAL(windowStateChanged(Qt::WindowStates, Qt::WindowStates)),
                      q, SLOT(_q_processWindowStateChanged(Qt::WindowStates, Qt::WindowStates)));
+    QObject::connect(child, SIGNAL(windowStateChanged(Qt::WindowStates,Qt::WindowStates)),
+                     q, SLOT(_q_processWindowStateChanged(Qt::WindowStates,Qt::WindowStates)));
+}
 …
+    }
     QRect domain = q->viewport()->rect();
+    QRect domain = viewport->rect();
     if (rearranger->type() == Rearranger::RegularTiler && !widgets.isEmpty())
         domain = resizeToMinimumTileSize(minSubWindowSize, widgets.count());
 …
     QMdiSubWindow *stackUnderChild = 0;
     if (!windowStaysOnTop(mdiChild)) {
         foreach (QObject *object, q_func()->viewport()->children()) {
+        foreach (QObject *object, viewport->children()) {
             QMdiSubWindow *child = qobject_cast<QMdiSubWindow *>(object);
             if (!child || !childWindows.contains(child))
 …
     Q_Q(QMdiArea);
     if (!minSubWindowSize.isValid() || subWindowCount <= 0)
         return q->viewport()->rect();
+        return viewport->rect();
     // Calculate minimum size.
 …
         int minAreaWidth = minWidth + left + right + 2;
         int minAreaHeight = minHeight + top + bottom + 2;
         if (q->horizontalScrollBar()->isVisible())
             minAreaHeight += q->horizontalScrollBar()->height();
         if (q->verticalScrollBar()->isVisible())
             minAreaWidth += q->verticalScrollBar()->width();
+        if (hbar->isVisible())
+            minAreaHeight += hbar->height();
+        if (vbar->isVisible())
+            minAreaWidth += vbar->width();
         if (q->style()->styleHint(QStyle::SH_ScrollView_FrameOnlyAroundContents, 0, q)) {
             const int frame = q->style()->pixelMetric(QStyle::PM_DefaultFrameWidth, 0, q);
 …
+    }
     QRect domain = q->viewport()->rect();
+    QRect domain = viewport->rect();
     // Adjust domain width and provide horizontal scroll bar.
     if (domain.width() < minWidth) {
         domain.setWidth(minWidth);
         if (q->horizontalScrollBarPolicy() == Qt::ScrollBarAlwaysOff)
+        if (hbarpolicy == Qt::ScrollBarAlwaysOff)
             q->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded);
         else if (q->horizontalScrollBar()->value() != 0)
             q->horizontalScrollBar()->setValue(0);
+        else
+            hbar->setValue(0);
+    }
     // Adjust domain height and provide vertical scroll bar.
     if (domain.height() < minHeight) {
         domain.setHeight(minHeight);
         if (q->verticalScrollBarPolicy() == Qt::ScrollBarAlwaysOff)
+        if (vbarpolicy  == Qt::ScrollBarAlwaysOff)
             q->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
         else if (q->verticalScrollBar()->value() != 0)
             q->verticalScrollBar()->setValue(0);
+        else
+            vbar->setValue(0);
+    }
     return domain;
 …
 /*!
     Gives the keyboard focus to the next window in the list of child
     windows.  The windows are activated in the order in which they are
     created (CreationOrder).
     \sa activatePreviousSubWindow()
+    Gives the keyboard focus to another window in the list of child
+    windows.  The window activated will be the next one determined
+    by the current \l{QMdiArea::WindowOrder} {activation order}.
+    \sa activatePreviousSubWindow(), QMdiArea::WindowOrder
 */
 void QMdiArea::activateNextSubWindow()
 …
 /*!
     Gives the keyboard focus to the previous window in the list of
     child windows. The windows are activated in the order in which
     they are created (CreationOrder).
     \sa activateNextSubWindow()
+    Gives the keyboard focus to another window in the list of child
+    windows.  The window activated will be the previous one determined
+    by the current \l{QMdiArea::WindowOrder} {activation order}.
+    \sa activateNextSubWindow(), QMdiArea::WindowOrder
 */
 void QMdiArea::activatePreviousSubWindow()
 …
     Removes \a widget from the MDI area. The \a widget must be
     either a QMdiSubWindow or a widget that is the internal widget of
+    a subwindow. Note that the subwindow is not deleted by QMdiArea
+    and that its parent is set to 0.
+    a subwindow. Note \a widget is never actually deleted by QMdiArea.
+    If a QMdiSubWindow is passed in its parent is set to 0 and it is
+    removed, but if an internal widget is passed in the child widget
+    is set to 0 but the QMdiSubWindow is not removed.
     \sa addSubWindow()

trunk/src/gui/widgets/qmdiarea.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/qmdiarea_p.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/qmdisubwindow.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     QMdiArea.
     \since 4.3
     \ingroup application
+    \mainclass
+    \ingroup mainwindow-classes
     QMdiSubWindow represents a top-level window in a QMdiArea, and consists
 …
     Q_Q(QMdiSubWindow);
     baseWidget->removeEventFilter(q);
     if (QLayout *layout = q->layout())
+    if (layout)
         layout->removeWidget(baseWidget);
     if (baseWidget->windowTitle() == q->windowTitle()) {
 …
     actions[CloseAction]->setIcon(style->standardIcon(QStyle::SP_TitleBarCloseButton, 0, q));
 #if !defined(QT_NO_SHORTCUT)
     actions[CloseAction]->setShortcut(QKeySequence::Close);
+    actions[CloseAction]->setShortcuts(QKeySequence::Close);
 #endif
     updateActions();
 …
+{
     // No update necessary
     if (!q_func()->parent())
+    if (!parent)
         return;
 …
+{
     Q_Q(QMdiSubWindow);
     if (!q->parent())
+    if (!parent)
         return;
 …
         q->clearMask();
     if (!q->parent())
+    if (!parent)
         return;
 …
     Q_Q(QMdiSubWindow);
     Q_ASSERT(currentOperation != None);
     Q_ASSERT(q->parent());
+    Q_ASSERT(parent);
     uint cflags = operationMap.find(currentOperation).value().changeFlags;
 …
+{
     Q_Q(QMdiSubWindow);
     Q_ASSERT(q->parent());
+    Q_ASSERT(parent);
     ensureWindowState(Qt::WindowMinimized);
 …
+{
     Q_Q(QMdiSubWindow);
     Q_ASSERT(q->parent());
+    Q_ASSERT(parent);
     isShadeMode = false;
 …
+{
     Q_Q(QMdiSubWindow);
     Q_ASSERT(q->parent());
+    Q_ASSERT(parent);
     ensureWindowState(Qt::WindowMaximized);
 …
+{
     Q_Q(QMdiSubWindow);
     if (!q->parent() || !activationEnabled)
+    if (!parent || !activationEnabled)
         return;
 …
+{
     Q_Q(const QMdiSubWindow);
     if (!q->parent() || q->windowFlags() & Qt::FramelessWindowHint
+    if (!parent || q->windowFlags() & Qt::FramelessWindowHint
         || (q->isMaximized() && !drawTitleBarWhenMaximized())) {
         return 0;
 …
     Q_Q(const QMdiSubWindow);
     Qt::WindowFlags flags = q->windowFlags();
     if (!q->parent() || flags & Qt::FramelessWindowHint) {
+    if (!parent || flags & Qt::FramelessWindowHint) {
         *margin = 0;
         *minWidth = 0;
 …
         return false;
 #if defined(Q_WS_MAC) && !defined(QT_NO_STYLE_MAC) || defined(Q_OS_WINCE_WM)
+#if defined(Q_WS_MAC) && !defined(QT_NO_STYLE_MAC) || defined(Q_WS_WINCE_WM)
     return true;
 #else
 …
         return;
     Q_ASSERT(oldGeometry.isValid());
     Q_ASSERT(q->parent());
+    Q_ASSERT(parent);
     if (!rubberBand) {
         rubberBand = new QRubberBand(QRubberBand::Rectangle, q->parentWidget());
 …
         newPalette.setColor(QPalette::Inactive, QPalette::HighlightedText,
                             colorref2qrgb(GetSysColor(COLOR_INACTIVECAPTIONTEXT)));
+        if (QSysInfo::WindowsVersion != QSysInfo::WV_95
+                && QSysInfo::WindowsVersion != QSysInfo::WV_NT) {
+            colorsInitialized = true;
+            BOOL hasGradient;
+            QT_WA({
+                SystemParametersInfo(SPI_GETGRADIENTCAPTIONS, 0, &hasGradient, 0);
+            } , {
+                SystemParametersInfoA(SPI_GETGRADIENTCAPTIONS, 0, &hasGradient, 0);
+            });
+            if (hasGradient) {
+                newPalette.setColor(QPalette::Active, QPalette::Base,
+                                    colorref2qrgb(GetSysColor(COLOR_GRADIENTACTIVECAPTION)));
+                newPalette.setColor(QPalette::Inactive, QPalette::Base,
+                                    colorref2qrgb(GetSysColor(COLOR_GRADIENTINACTIVECAPTION)));
+            } else {
+                newPalette.setColor(QPalette::Active, QPalette::Base,
+                                    newPalette.color(QPalette::Active, QPalette::Highlight));
+                newPalette.setColor(QPalette::Inactive, QPalette::Base,
+                                    newPalette.color(QPalette::Inactive, QPalette::Highlight));
+            }
+        colorsInitialized = true;
+        BOOL hasGradient = false;
+        SystemParametersInfo(SPI_GETGRADIENTCAPTIONS, 0, &hasGradient, 0);
+        if (hasGradient) {
+            newPalette.setColor(QPalette::Active, QPalette::Base,
+                                colorref2qrgb(GetSysColor(COLOR_GRADIENTACTIVECAPTION)));
+            newPalette.setColor(QPalette::Inactive, QPalette::Base,
+                                colorref2qrgb(GetSysColor(COLOR_GRADIENTINACTIVECAPTION)));
+        } else {
+            newPalette.setColor(QPalette::Active, QPalette::Base,
+                                newPalette.color(QPalette::Active, QPalette::Highlight));
+            newPalette.setColor(QPalette::Inactive, QPalette::Base,
+                                newPalette.color(QPalette::Inactive, QPalette::Highlight));
+        }
+    }
 …
+{
     Q_Q(QMdiSubWindow);
     if (!q->parent()) {
+    if (!parent) {
         q->setWindowFlags(windowFlags);
         return;
 …
+{
     Q_Q(const QMdiSubWindow);
     if (!q->parent() || q->windowFlags() & Qt::FramelessWindowHint)
+    if (!parent || q->windowFlags() & Qt::FramelessWindowHint)
         return QSize(-1, -1);
     return QSize(q->style()->pixelMetric(QStyle::PM_MdiSubWindowMinimizedWidth, 0, q), titleBarHeight());
 …
         return;
     if (q->layout() && q->layout()->indexOf(newSizeGrip) != -1)
+    if (layout && layout->indexOf(newSizeGrip) != -1)
         return;
     newSizeGrip->setFixedSize(newSizeGrip->sizeHint());
     bool putSizeGripInLayout = q->layout() ? true : false;
+    bool putSizeGripInLayout = layout ? true : false;
 #if defined(Q_WS_MAC) && !defined(QT_NO_STYLE_MAC)
     if (qobject_cast<QMacStyle *>(q->style()))
 …
 #endif
     if (putSizeGripInLayout) {
         q->layout()->addWidget(newSizeGrip);
         q->layout()->setAlignment(newSizeGrip, Qt::AlignBottom | Qt::AlignRight);
+        layout->addWidget(newSizeGrip);
+        layout->setAlignment(newSizeGrip, Qt::AlignBottom | Qt::AlignRight);
     } else {
         newSizeGrip->setParent(q);
 …
         d->menuIcon = windowIcon();
 #endif
     connect(qApp, SIGNAL(focusChanged(QWidget *, QWidget *)),
             this, SLOT(_q_processFocusChanged(QWidget *, QWidget *)));
+    connect(qApp, SIGNAL(focusChanged(QWidget*,QWidget*)),
+            this, SLOT(_q_processFocusChanged(QWidget*,QWidget*)));
+}

trunk/src/gui/widgets/qmdisubwindow.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/qmdisubwindow_p.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
+    {
         Q_Q(const QMdiSubWindow);
         if (!q->parent() || q->windowFlags() & Qt::FramelessWindowHint
+        if (!parent || q->windowFlags() & Qt::FramelessWindowHint
             || (q->isMaximized() && !drawTitleBarWhenMaximized())) {
             return 0;
 …
+    {
         Q_Q(QMdiSubWindow);
         Q_ASSERT(q->parent());
+        Q_ASSERT(parent);
         geometry->setSize(geometry->size().expandedTo(internalMinimumSize));
 #ifndef QT_NO_RUBBERBAND

trunk/src/gui/widgets/qmenu.cpp

-              r305
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #include "qwidgetaction.h"
 #include "qtoolbutton.h"
+#include "qpushbutton.h"
+#include <private/qpushbutton_p.h>
 #include <private/qaction_p.h>
+#include <private/qsoftkeymanager_p.h>
 #ifdef QT3_SUPPORT
 #include <qmenudata.h>
 …
+{
     Q_Q(QMenu);
-    activationRecursionGuard = false;
 #ifndef QT_NO_WHATSTHIS
     q->setAttribute(Qt::WA_CustomWhatsThis);
 …
         scroll->scrollFlags = QMenuPrivate::QMenuScroller::ScrollNone;
+    }
+#ifdef QT_SOFTKEYS_ENABLED
+    selectAction = QSoftKeyManager::createKeyedAction(QSoftKeyManager::SelectSoftKey, Qt::Key_Select, q);
+    cancelAction = QSoftKeyManager::createKeyedAction(QSoftKeyManager::CancelSoftKey, Qt::Key_Back, q);
+    selectAction->setVisible(false); // Don't show these in the menu
+    cancelAction->setVisible(false);
+    q->addAction(selectAction);
+    q->addAction(cancelAction);
+#endif
+}
+int QMenuPrivate::scrollerHeight() const
+{
+    Q_Q(const QMenu);
+    return qMax(QApplication::globalStrut().height(), q->style()->pixelMetric(QStyle::PM_MenuScrollerHeight, 0, q));
+}
+// Windows, OS/2 and KDE allows menus to cover the taskbar, while GNOME and Mac don't
+QRect QMenuPrivate::popupGeometry(const QWidget *widget) const
+{
+#if defined(Q_WS_WIN) || defined(Q_WS_PM)
+    return QApplication::desktop()->screenGeometry(widget);
+#elif defined Q_WS_X11
+    if (X11->desktopEnvironment == DE_KDE)
+        return QApplication::desktop()->screenGeometry(widget);
+    else
+        return QApplication::desktop()->availableGeometry(widget);
+#else
+        return QApplication::desktop()->availableGeometry(widget);
+#endif
+}
 …
+}
 void QMenuPrivate::calcActionRects(QMap<QAction*, QRect> &actionRects, QList<QAction*> &actionList) const
+void QMenuPrivate::updateActionRects() const
+{
     Q_Q(const QMenu);
+    if (!itemsDirty) {
+        actionRects = this->actionRects;
+        actionList = this->actionList;
+    if (!itemsDirty)
         return;
+    }
+    actionRects.clear();
+    actionList.clear();
+    QList<QAction*> items = filterActions(q->actions());
+    q->ensurePolished();
+    //let's reinitialize the buffer
+    actionRects.resize(actions.count());
+    actionRects.fill(QRect());
+    //let's try to get the last visible action
+    int lastVisibleAction = actions.count() - 1;
+    for(;lastVisibleAction >= 0; --lastVisibleAction) {
+        const QAction *action = actions.at(lastVisibleAction);
+        if (action->isVisible()) {
+            //removing trailing separators
+            if (action->isSeparator() && collapsibleSeparators)
+                continue;
+            break;
+        }
+    }
     int max_column_width = 0,
+        dh = popupGeometry(QApplication::desktop()->screenNumber(q)).height(),
+        ncols = 1,
+        dh = popupGeometry(q).height(),
         y = 0;
+    const int hmargin = q->style()->pixelMetric(QStyle::PM_MenuHMargin, 0, q),
+              vmargin = q->style()->pixelMetric(QStyle::PM_MenuVMargin, 0, q),
+              icone = q->style()->pixelMetric(QStyle::PM_SmallIconSize, 0, q);
+    QStyle *style = q->style();
+    QStyleOption opt;
+    opt.init(q);
+    const int hmargin = style->pixelMetric(QStyle::PM_MenuHMargin, &opt, q),
+              vmargin = style->pixelMetric(QStyle::PM_MenuVMargin, &opt, q),
+              icone = style->pixelMetric(QStyle::PM_SmallIconSize, &opt, q);
+    const int fw = style->pixelMetric(QStyle::PM_MenuPanelWidth, &opt, q);
+    const int deskFw = style->pixelMetric(QStyle::PM_MenuDesktopFrameWidth, &opt, q);
+    const int sfcMargin = style->sizeFromContents(QStyle::CT_Menu, &opt, QApplication::globalStrut(), q).width() - QApplication::globalStrut().width();
+    const int min_column_width = q->minimumWidth() - (sfcMargin + leftmargin + rightmargin + 2 * (fw + hmargin));
+    const int tearoffHeight = tearoff ? style->pixelMetric(QStyle::PM_MenuTearoffHeight, &opt, q) : 0;
     //for compatability now - will have to refactor this away..
 …
     maxIconWidth = 0;
     hasCheckableItems = false;
+    for(int i = 0; i < items.count(); i++) {
+        QAction *action = items.at(i);
+        if (widgetItems.value(action))
+    ncols = 1;
+    sloppyAction = 0;
+    for (int i = 0; i < actions.count(); ++i) {
+        QAction *action = actions.at(i);
+        if (action->isSeparator() || !action->isVisible() || widgetItems.contains(action))
             continue;
+        //..and some members
         hasCheckableItems |= action->isCheckable();
         QIcon is = action->icon();
         if (!is.isNull()) {
+            uint miw = maxIconWidth;
+            maxIconWidth = qMax<uint>(miw, icone + 4);
+            maxIconWidth = qMax<uint>(maxIconWidth, icone + 4);
+        }
+    }
 …
     //calculate size
     QFontMetrics qfm = q->fontMetrics();
+    for(int i = 0; i < items.count(); i++) {
+        QAction *action = items.at(i);
+        QFontMetrics fm(action->font().resolve(q->font()));
+        QSize sz;
+    bool previousWasSeparator = true; // this is true to allow removing the leading separators
+    for(int i = 0; i <= lastVisibleAction; i++) {
+        QAction *action = actions.at(i);
+        if (!action->isVisible() ||
+            (collapsibleSeparators && previousWasSeparator && action->isSeparator()))
+            continue; // we continue, this action will get an empty QRect
+        previousWasSeparator = action->isSeparator();
         //let the style modify the above size..
         QStyleOptionMenuItem opt;
         q->initStyleOption(&opt, action);
+        opt.rect = q->rect();
+        const QFontMetrics &fm = opt.fontMetrics;
+        QSize sz;
         if (QWidget *w = widgetItems.value(action)) {
           sz=w->sizeHint().expandedTo(w->minimumSize()).expandedTo(w->minimumSizeHint()).boundedTo(w->maximumSize());
+          sz = w->sizeHint().expandedTo(w->minimumSize()).expandedTo(w->minimumSizeHint()).boundedTo(w->maximumSize());
         } else {
             //calc what I think the size is..
 …
     #endif
+                }
+                int w = fm.boundingRect(QRect(), Qt::TextSingleLine, s).width();
+                w -= s.count(QLatin1Char('&')) * fm.width(QLatin1Char('&'));
+                w += s.count(QLatin1String("&&")) * fm.width(QLatin1Char('&'));
+                sz.setWidth(w);
+                sz.setWidth(fm.boundingRect(QRect(), Qt::TextSingleLine | Qt::TextShowMnemonic, s).width());
                 sz.setHeight(qMax(fm.height(), qfm.height()));
 …
+                }
+            }
           sz = q->style()->sizeFromContents(QStyle::CT_MenuItem, &opt, sz, q);
+            sz = style->sizeFromContents(QStyle::CT_MenuItem, &opt, sz, q);
+        }
         if (!sz.isEmpty()) {
             max_column_width = qMax(max_column_width, sz.width());
+            max_column_width = qMax(min_column_width, qMax(max_column_width, sz.width()));
             //wrapping
             if (!scroll &&
                y+sz.height()+vmargin > dh - (q->style()->pixelMetric(QStyle::PM_MenuDesktopFrameWidth, 0, q) * 2)) {
+               y+sz.height()+vmargin > dh - (deskFw * 2)) {
                 ncols++;
                 y = vmargin;
+            }
             y += sz.height();
+            //append item
+            actionRects.insert(action, QRect(0, 0, sz.width(), sz.height()));
+            actionList.append(action);
+        }
+    }
+    if (tabWidth)
+        max_column_width += tabWidth; //finally add in the tab width
+            //update the item
+            actionRects[i] = QRect(0, 0, sz.width(), sz.height());
+        }
+    }
+    max_column_width += tabWidth; //finally add in the tab width
     //calculate position
+    int x = hmargin;
+    y = vmargin;
+    for(int i = 0; i < actionList.count(); i++) {
+        QAction *action = actionList.at(i);
+        QRect &rect = actionRects[action];
+    const int base_y = vmargin + fw + topmargin +
+        (scroll ? scroll->scrollOffset : 0) +
+        tearoffHeight;
+    int x = hmargin + fw + leftmargin;
+    y = base_y;
+    for(int i = 0; i < actions.count(); i++) {
+        QRect &rect = actionRects[i];
         if (rect.isNull())
             continue;
         if (!scroll &&
+           y+rect.height() > dh - (q->style()->pixelMetric(QStyle::PM_MenuDesktopFrameWidth, 0, q) * 2)) {
+            ncols--;
+            if (ncols < 0)
+                qWarning("QMenu: Column calculation mismatch (%d)", ncols);
+           y+rect.height() > dh - deskFw * 2) {
             x += max_column_width + hmargin;
             y = vmargin;
+            y = base_y;
+        }
         rect.translate(x, y);                        //move
         rect.setWidth(max_column_width); //uniform width
+        //we need to update the widgets geometry
+        if (QWidget *widget = widgetItems.value(actions.at(i))) {
+            widget->setGeometry(rect);
+            widget->setVisible(actions.at(i)->isVisible());
+        }
         y += rect.height();
+    }
+}
-void QMenuPrivate::updateActions()
+{
-    Q_Q(const QMenu);
-    if (!itemsDirty)
-        return;
-    sloppyAction = 0;
-    calcActionRects(actionRects, actionList);
-    for (QHash<QAction *, QWidget *>::ConstIterator item = widgetItems.constBegin(),
-         end = widgetItems.constEnd(); item != end; ++item) {
-        QAction *action = item.key();
-        QWidget *widget = item.value();
-        widget->setGeometry(actionRect(action));
-        widget->setVisible(action->isVisible());
+    }
-    ncols = 1;
-    int last_left = q->style()->pixelMetric(QStyle::PM_MenuVMargin, 0, q);
-    if (!scroll) {
-        for(int i = 0; i < actionList.count(); i++) {
-            int left = actionRects.value(actionList.at(i)).left();
-            if (left > last_left) {
-                last_left = left;
-                ncols++;
+            }
+        }
+    }
     itemsDirty = 0;
+}
-QList<QAction *> QMenuPrivate::filterActions(const QList<QAction *> &actions) const
+{
-    QList<QAction *> visibleActions;
-    int i = 0;
-    while (i < actions.count()) {
-        QAction *action = actions.at(i);
-        if (!action->isVisible()) {
-            ++i;
-            continue;
+        }
-        if (!action->isSeparator() || !collapsibleSeparators) {
-            visibleActions.append(action);
-            ++i;
-            continue;
+        }
-        // no leading separators
-        if (!visibleActions.isEmpty())
-            visibleActions.append(action);
-        // skip double/tripple/etc. separators
-        while (i < actions.count()
-               && (!actions.at(i)->isVisible() || actions.at(i)->isSeparator()))
-            ++i;
+    }
-    if (collapsibleSeparators) {
-        // remove trailing separators
-        while (!visibleActions.isEmpty() && visibleActions.last()->isSeparator())
-            visibleActions.removeLast();
+    }
-    return visibleActions;
+}
 QRect QMenuPrivate::actionRect(QAction *act) const
+{
+    Q_Q(const QMenu);
+    QRect ret = actionRects.value(act);
+    if (ret.isNull())
+        return ret;
+    if (scroll)
+        ret.translate(0, scroll->scrollOffset);
+    if (tearoff)
+        ret.translate(0, q->style()->pixelMetric(QStyle::PM_MenuTearoffHeight, 0, q));
+    const int fw = q->style()->pixelMetric(QStyle::PM_MenuPanelWidth, 0, q);
+    ret.translate(fw+leftmargin, fw+topmargin);
+    return ret;
+}
+    int index = actions.indexOf(act);
+    if (index == -1)
+        return QRect();
+    updateActionRects();
+    //we found the action
+    return actionRects.at(index);
+}
+#if defined(Q_WS_MAC)
+static const qreal MenuFadeTimeInSec = 0.150;
+#endif
 void QMenuPrivate::hideUpToMenuBar()
+{
     Q_Q(QMenu);
+    bool fadeMenus = q->style()->styleHint(QStyle::SH_Menu_FadeOutOnHide);
     if (!tornoff) {
         QWidget *caused = causedPopup.widget;
 …
                 caused = m->d_func()->causedPopup.widget;
                 if (!m->d_func()->tornoff)
+                    hideMenu(m);
+                m->d_func()->setCurrentAction(0);
+            } else {
+#ifndef QT_NO_TOOLBUTTON
+                if (qobject_cast<QToolButton*>(caused) == 0)
+#endif
+                    qWarning("QMenu: Internal error");
+                caused = 0;
+                    hideMenu(m, fadeMenus);
+                if (!fadeMenus) // Mac doesn't clear the action until after hidden.
+                    m->d_func()->setCurrentAction(0);
+            } else {                caused = 0;
+            }
+        }
+#if defined(Q_WS_MAC)
+        if (fadeMenus) {
+            QEventLoop eventLoop;
+            QTimer::singleShot(int(MenuFadeTimeInSec * 1000), &eventLoop, SLOT(quit()));
+            QMacWindowFader::currentFader()->performFade();
+            eventLoop.exec();
+        }
+#endif
+    }
     setCurrentAction(0);
+}
 void QMenuPrivate::hideMenu(QMenu *menu)
+void QMenuPrivate::hideMenu(QMenu *menu, bool justRegister)
+{
     if (!menu)
         return;
 #if !defined(QT_NO_EFFECTS)
     menu->blockSignals(true);
 …
     // Flash item which is about to trigger (if any).
     if (menu->style()->styleHint(QStyle::SH_Menu_FlashTriggeredItem)
         && currentAction && currentAction == actionAboutToTrigger) {
+        && currentAction && currentAction == actionAboutToTrigger
+        && menu->actions().contains(currentAction)) {
         QEventLoop eventLoop;
         QAction *activeAction = currentAction;
-        // Deselect and wait 60 ms.
         menu->setActiveAction(0);
         QTimer::singleShot(60, &eventLoop, SLOT(quit()));
 …
     if (menu->style()->styleHint(QStyle::SH_Menu_FadeOutOnHide)) {
         // ### Qt 4.4:
         // Should be something like: q->transitionWindow(Qt::FadeOutTransition, 150);
+        // Should be something like: q->transitionWindow(Qt::FadeOutTransition, MenuFadeTimeInSec);
         // Hopefully we'll integrate qt/research/windowtransitions into main before 4.4.
         // Talk to Richard, Trenton or Bjoern.
 #if defined(Q_WS_MAC)
+                macWindowFade(qt_mac_window_for(menu));         // FIXME - what is the default duration for view animations
+        // Wait for the transition to complete.
+                QEventLoop eventLoop;
+        QTimer::singleShot(150, &eventLoop, SLOT(quit()));
+        eventLoop.exec();
+        if (justRegister) {
+            QMacWindowFader::currentFader()->setFadeDuration(MenuFadeTimeInSec);
+            QMacWindowFader::currentFader()->registerWindowToFade(menu);
+        } else {
+            macWindowFade(qt_mac_window_for(menu), MenuFadeTimeInSec);
+        }
 #endif // Q_WS_MAC
+    }
 …
     menu->blockSignals(false);
 #endif // QT_NO_EFFECTS
+    menu->hide();
+    if (!justRegister)
+        menu->hide();
+}
 …
+{
     Q_Q(QMenu);
+    const int scrollerHeight = q->style()->pixelMetric(QStyle::PM_MenuScrollerHeight, 0, q);
+    for(int i = 0, saccum = 0; i < actionList.count(); i++) {
+        QAction *act = actionList[i];
+    updateActionRects();
+    for(int i = 0, saccum = 0; i < actions.count(); i++) {
+        const QRect &rect = actionRects.at(i);
+        if (rect.isNull())
+            continue;
         if (scroll && scroll->scrollFlags & QMenuScroller::ScrollUp) {
             saccum -= actionRects.value(act).height();
             if (saccum > scroll->scrollOffset-scrollerHeight)
+            saccum -= rect.height();
+            if (saccum > scroll->scrollOffset - scrollerHeight())
                 continue;
+        }
+        QAction *act = actions.at(i);
         if (!act->isSeparator() &&
            (q->style()->styleHint(QStyle::SH_Menu_AllowActiveAndDisabled, 0, q)
 …
     Q_Q(QMenu);
     tearoffHighlighted = 0;
+    if (action == currentAction && !(action && action->menu() && action->menu() != activeMenu)) {
+        if(QMenu *menu = qobject_cast<QMenu*>(causedPopup.widget)) {
+            if(causedPopup.action && menu->d_func()->activeMenu == q)
+                menu->d_func()->setCurrentAction(causedPopup.action, 0, reason, false);
+    if (action == currentAction) {
+        if (!action || !action->menu() || action->menu() == activeMenu) {
+            if(QMenu *menu = qobject_cast<QMenu*>(causedPopup.widget)) {
+                if(causedPopup.action && menu->d_func()->activeMenu == q)
+                    menu->d_func()->setCurrentAction(causedPopup.action, 0, reason, false);
+            }
+        }
         return;
 …
 #endif
 #ifdef QT3_SUPPORT
     emitHighlighted = (action && action != currentAction);
+    emitHighlighted = action;
 #endif
     currentAction = action;
 …
+            }
             q->update(actionRect(action));
-            QWidget *widget = widgetItems.value(action);
             if (reason == SelectedFromKeyboard) {
+                QWidget *widget = widgetItems.value(action);
                 if (widget) {
                     if (widget->focusPolicy() != Qt::NoFocus)
 …
                     // get the focus
                     // Since the menu is a pop-up, it uses the popup reason.
                     if (!q->hasFocus())
+                    if (!q->hasFocus()) {
                         q->setFocus(Qt::PopupFocusReason);
+                    }
+                }
+            }
 …
 #ifndef QT_NO_STATUSTIP
     }  else if (previousAction) {
+        QWidget *w = causedPopup.widget;
+        while (QMenu *m = qobject_cast<QMenu*>(w))
+            w = m->d_func()->causedPopup.widget;
+        if (w) {
+            QString empty;
+            QStatusTipEvent tip(empty);
+            QApplication::sendEvent(w, &tip);
+        }
+        previousAction->d_func()->showStatusText(topCausedWidget(), QString());
 #endif
+    }
 …
+}
+//return the top causedPopup.widget that is not a QMenu
+QWidget *QMenuPrivate::topCausedWidget() const
+{
+    QWidget* top = causedPopup.widget;
+    while (QMenu* m = qobject_cast<QMenu *>(top))
+        top = m->d_func()->causedPopup.widget;
+    return top;
+}
 QAction *QMenuPrivate::actionAt(QPoint p) const
+{
 …
        return 0;
+    for(int i = 0; i < actionList.count(); i++) {
+        QAction *act = actionList[i];
+        if (actionRect(act).contains(p))
+            return act;
+    for(int i = 0; i < actionRects.count(); i++) {
+        if (actionRects.at(i).contains(p))
+            return actions.at(i);
+    }
     return 0;
 …
+}
+void QMenuPrivate::updateLayoutDirection()
+{
+    Q_Q(QMenu);
+    //we need to mimic the cause of the popup's layout direction
+    //to allow setting it on a mainwindow for example
+    //we call setLayoutDirection_helper to not overwrite a user-defined value
+    if (!q->testAttribute(Qt::WA_SetLayoutDirection)) {
+        if (QWidget *w = causedPopup.widget)
+            setLayoutDirection_helper(w->layoutDirection());
+        else if (QWidget *w = q->parentWidget())
+            setLayoutDirection_helper(w->layoutDirection());
+        else
+            setLayoutDirection_helper(QApplication::layoutDirection());
+    }
+}
 /*!
     Returns the action associated with this menu.
 …
     if (!scroll || !scroll->scrollFlags)
         return;
+    updateActionRects();
     int newOffset = 0;
+    const int scrollHeight = q->style()->pixelMetric(QStyle::PM_MenuScrollerHeight, 0, q);
+    const int topScroll = (scroll->scrollFlags & QMenuScroller::ScrollUp)   ? scrollHeight : 0;
+    const int botScroll = (scroll->scrollFlags & QMenuScroller::ScrollDown) ? scrollHeight : 0;
+    const int topScroll = (scroll->scrollFlags & QMenuScroller::ScrollUp)   ? scrollerHeight() : 0;
+    const int botScroll = (scroll->scrollFlags & QMenuScroller::ScrollDown) ? scrollerHeight() : 0;
     const int vmargin = q->style()->pixelMetric(QStyle::PM_MenuVMargin, 0, q);
     const int fw = q->style()->pixelMetric(QStyle::PM_MenuPanelWidth, 0, q);
     if (location == QMenuScroller::ScrollTop) {
+        for(int i = 0, saccum = 0; i < actionList.count(); i++) {
+            QAction *act = actionList.at(i);
+            if (act == action) {
+        for(int i = 0, saccum = 0; i < actions.count(); i++) {
+            if (actions.at(i) == action) {
                 newOffset = topScroll - saccum;
                 break;
+            }
             saccum += actionRects.value(act).height();
+            saccum += actionRects.at(i).height();
+        }
     } else {
+        for(int i = 0, saccum = 0; i < actionList.count(); i++) {
+            QAction *act = actionList.at(i);
+            saccum += actionRects.value(act).height();
+            if (act == action) {
+        for(int i = 0, saccum = 0; i < actions.count(); i++) {
+            saccum += actionRects.at(i).height();
+            if (actions.at(i) == action) {
                 if (location == QMenuScroller::ScrollCenter)
                     newOffset = ((q->height() / 2) - botScroll) - (saccum - topScroll);
 …
+        }
         if(newOffset)
             newOffset -= fw*2;
+            newOffset -= fw * 2;
+    }
 …
         newScrollFlags |= QMenuScroller::ScrollUp;
     int saccum = newOffset;
     for(int i = 0; i < actionList.count(); i++) {
         saccum += actionRects.value(actionList.at(i)).height();
+    for(int i = 0; i < actionRects.count(); i++) {
+        saccum += actionRects.at(i).height();
         if (saccum > q->height()) {
             newScrollFlags |= QMenuScroller::ScrollDown;
 …
         newOffset -= vmargin;
     QRect screen = popupGeometry(QApplication::desktop()->screenNumber(q));
+    QRect screen = popupGeometry(q);
     const int desktopFrame = q->style()->pixelMetric(QStyle::PM_MenuDesktopFrameWidth, 0, q);
     if (q->height() < screen.height()-(desktopFrame*2)-1) {
 …
     //actually update flags
+    scroll->scrollOffset = newOffset;
+    if (scroll->scrollOffset > 0)
+        scroll->scrollOffset = 0;
+    const int delta = qMin(0, newOffset) - scroll->scrollOffset; //make sure the new offset is always negative
+    if (!itemsDirty && delta) {
+        //we've scrolled so we need to update the action rects
+        for (int i = 0; i < actionRects.count(); ++i) {
+            QRect &current = actionRects[i];
+            current.moveTop(current.top() + delta);
+            //we need to update the widgets geometry
+            if (QWidget *w = widgetItems.value(actions.at(i)))
+                w->setGeometry(current);
+        }
+    }
+    scroll->scrollOffset += delta;
     scroll->scrollFlags = newScrollFlags;
     if (active)
 …
+{
     Q_Q(QMenu);
+    updateActionRects();
     if(location == QMenuScroller::ScrollBottom) {
+        for(int i = actionList.size()-1; i >= 0; --i) {
+            QAction *act = actionList.at(i);
+        for(int i = actions.size()-1; i >= 0; --i) {
+            QAction *act = actions.at(i);
+            if (actionRects.at(i).isNull())
+                continue;
             if (!act->isSeparator() &&
                 (q->style()->styleHint(QStyle::SH_Menu_AllowActiveAndDisabled, 0, q)
 …
+        }
     } else if(location == QMenuScroller::ScrollTop) {
+        for(int i = 0; i < actionList.size(); ++i) {
+            QAction *act = actionList.at(i);
+        for(int i = 0; i < actions.size(); ++i) {
+            QAction *act = actions.at(i);
+            if (actionRects.at(i).isNull())
+                continue;
             if (!act->isSeparator() &&
                 (q->style()->styleHint(QStyle::SH_Menu_AllowActiveAndDisabled, 0, q)
 …
     if (!scroll || !(scroll->scrollFlags & direction)) //not really possible...
         return;
     const int scrollHeight = q->style()->pixelMetric(QStyle::PM_MenuScrollerHeight, 0, q);
     const int topScroll = (scroll->scrollFlags & QMenuScroller::ScrollUp)   ? scrollHeight : 0;
     const int botScroll = (scroll->scrollFlags & QMenuScroller::ScrollDown) ? scrollHeight : 0;
+    updateActionRects();
+    const int topScroll = (scroll->scrollFlags & QMenuScroller::ScrollUp)   ? scrollerHeight() : 0;
+    const int botScroll = (scroll->scrollFlags & QMenuScroller::ScrollDown) ? scrollerHeight() : 0;
     const int vmargin = q->style()->pixelMetric(QStyle::PM_MenuVMargin, 0, q);
     const int fw = q->style()->pixelMetric(QStyle::PM_MenuPanelWidth, 0, q);
     const int offset = topScroll ? topScroll-vmargin : 0;
     if (direction == QMenuScroller::ScrollUp) {
+        for(int i = 0, saccum = 0; i < actionList.count(); i++) {
+            QAction *act = actionList.at(i);
+            const int iHeight = actionRects.value(act).height();
+            saccum -= iHeight;
+        for(int i = 0, saccum = 0; i < actions.count(); i++) {
+            saccum -= actionRects.at(i).height();
             if (saccum <= scroll->scrollOffset-offset) {
                 scrollMenu(act, page ? QMenuScroller::ScrollBottom : QMenuScroller::ScrollTop, active);
+                scrollMenu(actions.at(i), page ? QMenuScroller::ScrollBottom : QMenuScroller::ScrollTop, active);
                 break;
+            }
 …
     } else if (direction == QMenuScroller::ScrollDown) {
         bool scrolled = false;
+        for(int i = 0, saccum = 0; i < actionList.count(); i++) {
+            QAction *act = actionList.at(i);
+            const int iHeight = actionRects.value(act).height();
+        for(int i = 0, saccum = 0; i < actions.count(); i++) {
+            const int iHeight = actionRects.at(i).height();
             saccum -= iHeight;
             if (saccum <= scroll->scrollOffset-offset) {
                 const int scrollerArea = q->height() - botScroll - fw*2;
                 int visible = (scroll->scrollOffset-offset) - saccum;
+                for(i++ ; i < actionList.count(); i++) {
+                    act = actionList.at(i);
+                    const int iHeight = actionRects.value(act).height();
+                    visible += iHeight;
+                for(i++ ; i < actions.count(); i++) {
+                    visible += actionRects.at(i).height();
                     if (visible > scrollerArea - topScroll) {
                         scrolled = true;
                         scrollMenu(act, page ? QMenuScroller::ScrollTop : QMenuScroller::ScrollBottom, active);
+                        scrollMenu(actions.at(i), page ? QMenuScroller::ScrollTop : QMenuScroller::ScrollBottom, active);
                         break;
+                    }
 …
         bool isScroll = false;
         if (pos.x() >= 0 && pos.x() < q->width()) {
-            const int scrollerHeight = q->style()->pixelMetric(QStyle::PM_MenuScrollerHeight, 0, q);
             for(int dir = QMenuScroller::ScrollUp; dir <= QMenuScroller::ScrollDown; dir = dir << 1) {
                 if (scroll->scrollFlags & dir) {
                     if (dir == QMenuScroller::ScrollUp)
                         isScroll = (pos.y() <= scrollerHeight);
+                        isScroll = (pos.y() <= scrollerHeight());
                     else if (dir == QMenuScroller::ScrollDown)
                         isScroll = (pos.y() >= q->height()-scrollerHeight);
+                        isScroll = (pos.y() >= q->height() - scrollerHeight());
                     if (isScroll) {
                         scroll->scrollDirection = dir;
 …
+        }
         if (isScroll) {
+            if (!scroll->scrollTimer)
+                scroll->scrollTimer = new QBasicTimer;
+            scroll->scrollTimer->start(50, q);
+            scroll->scrollTimer.start(50, q);
             return true;
         } else if (scroll->scrollTimer && scroll->scrollTimer->isActive()) {
             scroll->scrollTimer->stop();
+        } else {
+            scroll->scrollTimer.stop();
+        }
+    }
 …
         QRect tearRect(0, 0, q->width(), q->style()->pixelMetric(QStyle::PM_MenuTearoffHeight, 0, q));
         if (scroll && scroll->scrollFlags & QMenuPrivate::QMenuScroller::ScrollUp)
             tearRect.translate(0, q->style()->pixelMetric(QStyle::PM_MenuScrollerHeight, 0, q));
+            tearRect.translate(0, scrollerHeight());
         q->update(tearRect);
         if (tearRect.contains(pos) && hasMouseMoved(e->globalPos())) {
 …
+}
+class ExceptionGuard
+{
+public:
+    inline ExceptionGuard(bool *w = 0) : watched(w) { Q_ASSERT(!(*watched)); *watched = true; }
+    inline ~ExceptionGuard() { *watched = false; }
+    inline operator bool() { return *watched; }
+private:
+    bool *watched;
+};
 void QMenuPrivate::activateCausedStack(const QList<QPointer<QWidget> > &causedStack, QAction *action, QAction::ActionEvent action_e, bool self)
+{
+    Q_ASSERT(!activationRecursionGuard);
+    activationRecursionGuard = true;
+    ExceptionGuard guard(&activationRecursionGuard);
 #ifdef QT3_SUPPORT
     const int actionId = q_func()->findIdForAction(action);
 …
+        }
+    }
-    activationRecursionGuard = false;
+}
 …
             hideUpToMenuBar();
         } else {
             for(QWidget *widget = qApp->activePopupWidget(); widget; ) {
+            for(QWidget *widget = QApplication::activePopupWidget(); widget; ) {
                 if (QMenu *qmenu = qobject_cast<QMenu*>(widget)) {
                     if(qmenu == q)
 …
+        }
 #endif
+        QWidget *w = causedPopup.widget;
+        while (QMenu *m = qobject_cast<QMenu*>(w))
+            w = m->d_func()->causedPopup.widget;
+        action->showStatusText(w);
+        action->showStatusText(topCausedWidget());
     } else {
         actionAboutToTrigger = 0;
 …
     Q_Q(QMenu);
     if (QAction *action = qobject_cast<QAction *>(q->sender())) {
+        QWeakPointer<QAction> actionGuard = action;
 #ifdef QT3_SUPPORT
         //we store it here because the action might be deleted/changed by connected slots
 …
 #endif
         if (!activationRecursionGuard) {
+        if (!activationRecursionGuard && actionGuard) {
             //in case the action has not been activated by the mouse
             //we check the parent hierarchy
 …
         option->palette.setCurrentColorGroup(QPalette::Disabled);
+    option->font = action->font();
+    option->font = action->font().resolve(font());
+    option->fontMetrics = QFontMetrics(option->font);
     if (d->currentAction && d->currentAction == action && !d->currentAction->isSeparator()) {
 …
     bars, context menus, and other popup menus.
     \ingroup application
+    \ingroup mainwindow-classes
     \ingroup basicwidgets
+    \mainclass
     A menu widget is a selection menu. It can be either a pull-down
 …
     It is not possible to display an icon in a native menu on Windows Mobile.
+    \section1 QMenu on Mac OS X with Qt build against Cocoa
+    QMenu can be inserted only once in a menu/menubar. Subsequent insertions will
+    have no effect or will result in a disabled menu item.
     See the \l{mainwindows/menus}{Menus} example for an example of how
     to use QMenuBar and QMenu in your application.
 …
+{
     Q_D(QMenu);
+    for (QHash<QAction *, QWidget *>::ConstIterator item = d->widgetItems.constBegin(),
+         end = d->widgetItems.constEnd(); item != end; ++item) {
+        QWidgetAction *action = static_cast<QWidgetAction *>(item.key());
+        QWidget *widget = item.value();
+        if (action && widget)
+    QHash<QAction *, QWidget *>::iterator it = d->widgetItems.begin();
+    for (; it != d->widgetItems.end(); ++it) {
+        if (QWidget *widget = it.value()) {
+            QWidgetAction *action = static_cast<QWidgetAction *>(it.key());
             action->releaseWidget(widget);
+    }
+    d->widgetItems.clear();
+            *it = 0;
+        }
+    }
     if (d->eventLoop)
         d->eventLoop->exit();
+    if (d->tornPopup)
+        d->tornPopup->close();
+    hideTearOffMenu();
+}
 …
     if (d->tearoff == b)
         return;
     if (!b && d->tornPopup)
         d->tornPopup->close();
+    if (!b)
+        hideTearOffMenu();
     d->tearoff = b;
 …
 void QMenu::hideTearOffMenu()
+{
     if (d_func()->tornPopup)
         d_func()->tornPopup->close();
+    if (QWidget *w = d_func()->tornPopup)
+        w->close();
+}
 …
+{
     Q_D(const QMenu);
+    ensurePolished();
+    QMap<QAction*, QRect> actionRects;
+    QList<QAction*> actionList;
+    d->calcActionRects(actionRects, actionList);
+    d->updateActionRects();
     QSize s;
+    QStyleOption opt(0);
+    opt.rect = rect();
+    opt.palette = palette();
+    opt.state = QStyle::State_None;
+    for (QMap<QAction*, QRect>::const_iterator i = actionRects.constBegin();
+         i != actionRects.constEnd(); ++i) {
+        if (i.value().bottom() > s.height())
+            s.setHeight(i.value().y()+i.value().height());
+        if (i.value().right() > s.width())
+            s.setWidth(i.value().right());
+    }
+    if (d->tearoff)
+        s.rheight() += style()->pixelMetric(QStyle::PM_MenuTearoffHeight, &opt, this);
+    if (const int fw = style()->pixelMetric(QStyle::PM_MenuPanelWidth, &opt, this)) {
+        s.rwidth() += fw*2;
+        s.rheight() += fw*2;
+    for (int i = 0; i < d->actionRects.count(); ++i) {
+        const QRect &rect = d->actionRects.at(i);
+        if (rect.isNull())
+            continue;
+        if (rect.bottom() >= s.height())
+            s.setHeight(rect.y() + rect.height());
+        if (rect.right() >= s.width())
+            s.setWidth(rect.x() + rect.width());
+    }
     // Note that the action rects calculated above already include
     // the top and left margins, so we only need to add margins for
     // the bottom and right.
+    s.rwidth() += style()->pixelMetric(QStyle::PM_MenuHMargin, &opt, this);
+    s.rheight() += style()->pixelMetric(QStyle::PM_MenuVMargin, &opt, this);
+    s += QSize(d->leftmargin + d->rightmargin, d->topmargin + d->bottommargin);
+    QStyleOption opt(0);
+    opt.init(this);
+    const int fw = style()->pixelMetric(QStyle::PM_MenuPanelWidth, &opt, this);
+    s.rwidth() += style()->pixelMetric(QStyle::PM_MenuHMargin, &opt, this) + fw + d->rightmargin;
+    s.rheight() += style()->pixelMetric(QStyle::PM_MenuVMargin, &opt, this) + fw + d->bottommargin;
     return style()->sizeFromContents(QStyle::CT_Menu, &opt,
 …
     d->motions = 0;
     d->doChildEffects = true;
+    d->updateLayoutDirection();
 #ifndef QT_NO_MENUBAR
     // if this menu is part of a chain attached to a QMenuBar, set the
     // _NET_WM_WINDOW_TYPE_DROPDOWN_MENU X11 window type
+    QWidget* top = this;
+    while (QMenu* m = qobject_cast<QMenu *>(top))
+        top = m->d_func()->causedPopup.widget;
+    setAttribute(Qt::WA_X11NetWmWindowTypeDropDownMenu, qobject_cast<QMenuBar *>(top) != 0);
+    setAttribute(Qt::WA_X11NetWmWindowTypeDropDownMenu, qobject_cast<QMenuBar *>(d->topCausedWidget()) != 0);
 #endif
     ensurePolished(); // Get the right font
     emit aboutToShow();
+    d->updateActions();
+    QPoint pos = p;
+    const bool actionListChanged = d->itemsDirty;
+    d->updateActionRects();
+    QPoint pos;
+    QPushButton *causedButton = qobject_cast<QPushButton*>(d->causedPopup.widget);
+    if (actionListChanged && causedButton)
+        pos = QPushButtonPrivate::get(causedButton)->adjustedMenuPosition();
+    else
+        pos = p;
     QSize size = sizeHint();
+    QRect screen = d->popupGeometry(QApplication::desktop()->screenNumber(p));
+    QRect screen;
+#ifndef QT_NO_GRAPHICSVIEW
+    bool isEmbedded = d->nearestGraphicsProxyWidget(this);
+    if (isEmbedded)
+        screen = d->popupGeometry(this);
+    else
+#endif
+    screen = d->popupGeometry(QApplication::desktop()->screenNumber(p));
     const int desktopFrame = style()->pixelMetric(QStyle::PM_MenuDesktopFrameWidth, 0, this);
     bool adjustToDesktop = !window()->testAttribute(Qt::WA_DontShowOnScreen);
+#ifdef QT_KEYPAD_NAVIGATION
+    if (!atAction && QApplication::keypadNavigationEnabled()) {
+        // Try to have one item activated
+        if (d->defaultAction && d->defaultAction->isEnabled()) {
+            atAction = d->defaultAction;
+            // TODO: This works for first level menus, not yet sub menus
+        } else {
+            foreach (QAction *action, d->actions)
+                if (action->isEnabled()) {
+                    atAction = action;
+                    break;
+                }
+        }
+        d->currentAction = atAction;
+    }
+#endif
     if (d->ncols > 1) {
         pos.setY(screen.top()+desktopFrame);
     } else if (atAction) {
         for(int i=0, above_height=0; i<(int)d->actionList.count(); i++) {
             QAction *action = d->actionList.at(i);
+        for(int i = 0, above_height = 0; i < d->actions.count(); i++) {
+            QAction *action = d->actions.at(i);
             if (action == atAction) {
                 int newY = pos.y()-above_height;
+                int newY = pos.y() - above_height;
                 if (d->scroll && newY < desktopFrame) {
                     d->scroll->scrollFlags = d->scroll->scrollFlags
 …
                     && !style()->styleHint(QStyle::SH_Menu_FillScreenWithScroll, 0, this)) {
                     int below_height = above_height + d->scroll->scrollOffset;
                     for(int i2 = i; i2 < (int)d->actionList.count(); i2++)
                         below_height += d->actionRects.value(d->actionList.at(i2)).height();
+                    for(int i2 = i; i2 < d->actionRects.count(); i2++)
+                        below_height += d->actionRects.at(i2).height();
                     size.setHeight(below_height);
+                }
                 break;
             } else {
                 above_height += d->actionRects.value(action).height();
+                above_height += d->actionRects.at(i).height();
+            }
+        }
 …
     if (adjustToDesktop) {
         //handle popup falling "off screen"
         if (qApp->layoutDirection() == Qt::RightToLeft) {
+        if (isRightToLeft()) {
             if(snapToMouse) //position flowing left from the mouse
                 pos.setX(mouse.x()-size.width());
+#ifndef QT_NO_MENUBAR
+            //if in a menubar, it should be right-aligned
+            if (qobject_cast<QMenuBar*>(d->causedPopup.widget))
+                pos.rx() -= size.width();
+#endif //QT_NO_MENUBAR
             if (pos.x() < screen.left()+desktopFrame)
 …
         } else {
             if (pos.x()+size.width()-1 > screen.right()-desktopFrame)
                 pos.setX(qMin(p.x()+size.width(), screen.right()-desktopFrame-size.width()+1));
+                pos.setX(screen.right()-desktopFrame-size.width()+1);
             if (pos.x() < screen.left()+desktopFrame)
                 pos.setX(qMax(p.x(), screen.left() + desktopFrame));
+                pos.setX(screen.left() + desktopFrame);
+        }
         if (pos.y() + size.height() - 1 > screen.bottom() - desktopFrame) {
 …
     setGeometry(QRect(pos, size));
 #ifndef QT_NO_EFFECTS
     int hGuess = qApp->layoutDirection() == Qt::RightToLeft ? QEffects::LeftScroll : QEffects::RightScroll;
+    int hGuess = isRightToLeft() ? QEffects::LeftScroll : QEffects::RightScroll;
     int vGuess = QEffects::DownScroll;
     if (qApp->layoutDirection() == Qt::RightToLeft) {
+    if (isRightToLeft()) {
         if ((snapToMouse && (pos.x() + size.width()/2 > mouse.x())) ||
            (qobject_cast<QMenu*>(d->causedPopup.widget) && pos.x() + size.width()/2 > d->causedPopup.widget->x()))
 …
+{
     QMenu menu(parent);
+    for(QList<QAction*>::ConstIterator it = actions.constBegin(); it != actions.constEnd(); ++it)
+        menu.addAction((*it));
+    menu.addActions(actions);
     return menu.exec(pos, at);
+}
 …
     d->causedPopup.widget = 0;
     d->causedPopup.action = 0;
+    if (d->scroll)
+        d->scroll->scrollTimer.stop(); //make sure the timer stops
+}
 …
+{
     Q_D(QMenu);
+    d->updateActionRects();
     QPainter p(this);
     QRegion emptyArea = QRegion(rect());
 …
     //draw the items that need updating..
     for (int i = 0; i < d->actionList.count(); ++i) {
         QAction *action = d->actionList.at(i);
         QRect adjustedActionRect = d->actionRect(action);
+    for (int i = 0; i < d->actions.count(); ++i) {
+        QAction *action = d->actions.at(i);
+        QRect adjustedActionRect = d->actionRects.at(i);
         if (!e->rect().intersects(adjustedActionRect)
             || d->widgetItems.value(action))
 …
     //draw the scroller regions..
     if (d->scroll) {
-        const int scrollerHeight = style()->pixelMetric(QStyle::PM_MenuScrollerHeight, 0, this);
         menuOpt.menuItemType = QStyleOptionMenuItem::Scroller;
         menuOpt.state |= QStyle::State_Enabled;
         if (d->scroll->scrollFlags & QMenuPrivate::QMenuScroller::ScrollUp) {
             menuOpt.rect.setRect(fw, fw, width() - (fw * 2), scrollerHeight);
+            menuOpt.rect.setRect(fw, fw, width() - (fw * 2), d->scrollerHeight());
             emptyArea -= QRegion(menuOpt.rect);
             p.setClipRect(menuOpt.rect);
 …
+        }
         if (d->scroll->scrollFlags & QMenuPrivate::QMenuScroller::ScrollDown) {
             menuOpt.rect.setRect(fw, height() - scrollerHeight - fw, width() - (fw * 2),
                                      scrollerHeight);
+            menuOpt.rect.setRect(fw, height() - d->scrollerHeight() - fw, width() - (fw * 2),
+                                     d->scrollerHeight());
             emptyArea -= QRegion(menuOpt.rect);
             menuOpt.state |= QStyle::State_DownArrow;
 …
                              style()->pixelMetric(QStyle::PM_MenuTearoffHeight, 0, this));
         if (d->scroll && d->scroll->scrollFlags & QMenuPrivate::QMenuScroller::ScrollUp)
             menuOpt.rect.translate(0, style()->pixelMetric(QStyle::PM_MenuScrollerHeight, 0, this));
+            menuOpt.rect.translate(0, d->scrollerHeight());
         emptyArea -= QRegion(menuOpt.rect);
         p.setClipRect(menuOpt.rect);
 …
             action->menu()->d_func()->setFirstActionActive();
         else {
 #if defined(Q_WS_WIN) && !defined(QT_NO_MENUBAR)
+#if defined(Q_WS_WIN)
             //On Windows only context menus can be activated with the right button
+            bool isContextMenu = true;
+            const QWidget *cause = d->causedPopup.widget;
+            while (cause) {
+                //if the popup was caused by either QMenuBar or a QToolButton, it is not a context menu
+                if (qobject_cast<const QMenuBar *>(cause) || qobject_cast<const QToolButton *>(cause)) {
+                    isContextMenu = false;
+                    break;
+                } else if (const QMenu *menu = qobject_cast<const QMenu *>(cause)) {
+                    cause = menu->d_func()->causedPopup.widget;
+                } else {
+                    break;
+                }
+            }
+            if (e->button() == Qt::LeftButton || (e->button() == Qt::RightButton && isContextMenu))
+            if (e->button() == Qt::LeftButton || d->topCausedWidget() == 0)
 #endif
                 d->activateAction(action, QAction::Trigger);
 …
     Q_D(QMenu);
     switch (e->type()) {
+    case QEvent::Polish:
+        d->updateLayoutDirection();
+        break;
     case QEvent::ShortcutOverride: {
             QKeyEvent *kev = static_cast<QKeyEvent*>(e);
 …
+        }
         d->itemsDirty = 1;
         d->updateActions();
+        d->updateActionRects();
         break; }
     case QEvent::Show:
         d->mouseDown = 0;
         d->updateActions();
+        d->updateActionRects();
         if (d->currentAction)
             d->popupAction(d->currentAction, 0, false);
 …
+{
     Q_D(QMenu);
+    d->updateActionRects();
     int key = e->key();
     if (isRightToLeft()) {  // in reverse mode open/close key for submenues are reversed
 …
         if (!d->currentAction) {
             if(key == Qt::Key_Down) {
+                for(int i = 0; i < d->actionList.size(); ++i) {
+                    QAction *act = d->actionList.at(i);
+                for(int i = 0; i < d->actions.count(); ++i) {
+                    QAction *act = d->actions.at(i);
+                    if (d->actionRects.at(i).isNull())
+                        continue;
                     if (!act->isSeparator() &&
                         (style()->styleHint(QStyle::SH_Menu_AllowActiveAndDisabled, 0, this)
 …
+                }
             } else {
+                for(int i = d->actionList.size()-1; i >= 0; --i) {
+                    QAction *act = d->actionList.at(i);
+                for(int i = d->actions.count()-1; i >= 0; --i) {
+                    QAction *act = d->actions.at(i);
+                    if (d->actionRects.at(i).isNull())
+                        continue;
                     if (!act->isSeparator() &&
                         (style()->styleHint(QStyle::SH_Menu_AllowActiveAndDisabled, 0, this)
 …
+            }
         } else {
             for(int i=0, y=0; !nextAction && i < (int)d->actionList.count(); i++) {
                 QAction *act = d->actionList.at(i);
+            for(int i = 0, y = 0; !nextAction && i < d->actions.count(); i++) {
+                QAction *act = d->actions.at(i);
                 if (act == d->currentAction) {
                     if (key == Qt::Key_Up) {
 …
                                 if (d->scroll)
                                     scroll_loc = QMenuPrivate::QMenuScroller::ScrollBottom;
                                 next_i = d->actionList.count()-1;
+                                next_i = d->actionRects.count()-1;
+                            }
                             QAction *next = d->actionList.at(next_i);
+                            QAction *next = d->actions.at(next_i);
                             if (next == d->currentAction)
                                 break;
+                            if (d->actionRects.at(next_i).isNull())
+                                continue;
                             if (next->isSeparator() ||
                                (!next->isEnabled() &&
 …
                             nextAction = next;
                             if (d->scroll && (d->scroll->scrollFlags & QMenuPrivate::QMenuScroller::ScrollUp)) {
                                 int topVisible = style()->pixelMetric(QStyle::PM_MenuScrollerHeight, 0, this);
+                                int topVisible = d->scrollerHeight();
                                 if (d->tearoff)
                                     topVisible += style()->pixelMetric(QStyle::PM_MenuTearoffHeight, 0, this);
                                 if (((y + d->scroll->scrollOffset) - topVisible) <= d->actionRects.value(nextAction).height())
+                                if (((y + d->scroll->scrollOffset) - topVisible) <= d->actionRects.at(next_i).height())
                                     scroll_loc = QMenuPrivate::QMenuScroller::ScrollTop;
+                            }
 …
                             d->tearoffHighlighted = 1;
                     } else {
                         y += d->actionRects.value(act).height();
+                        y += d->actionRects.at(i).height();
                         for(int next_i = i+1; true; next_i++) {
                             if (next_i == d->actionList.count()) {
+                            if (next_i == d->actionRects.count()) {
                                 if(!style()->styleHint(QStyle::SH_Menu_SelectionWrap, 0, this))
                                     break;
 …
                                 next_i = 0;
+                            }
                             QAction *next = d->actionList.at(next_i);
+                            QAction *next = d->actions.at(next_i);
                             if (next == d->currentAction)
                                 break;
+                            if (d->actionRects.at(next_i).isNull())
+                                continue;
                             if (next->isSeparator() ||
                                (!next->isEnabled() &&
 …
                             nextAction = next;
                             if (d->scroll && (d->scroll->scrollFlags & QMenuPrivate::QMenuScroller::ScrollDown)) {
+                                const int scrollerHeight = style()->pixelMetric(QStyle::PM_MenuScrollerHeight, 0, this);
+                                int bottomVisible = height()-scrollerHeight;
+                                int bottomVisible = height() - d->scrollerHeight();
                                 if (d->scroll->scrollFlags & QMenuPrivate::QMenuScroller::ScrollUp)
                                     bottomVisible -= scrollerHeight;
+                                    bottomVisible -= d->scrollerHeight();
                                 if (d->tearoff)
                                     bottomVisible -= style()->pixelMetric(QStyle::PM_MenuTearoffHeight, 0, this);
                                 if ((y + d->scroll->scrollOffset + d->actionRects.value(nextAction).height()) > bottomVisible)
+                                if ((y + d->scroll->scrollOffset + d->actionRects.at(next_i).height()) > bottomVisible)
                                     scroll_loc = QMenuPrivate::QMenuScroller::ScrollBottom;
+                            }
 …
                     break;
+                }
                 y += d->actionRects.value(act).height();
+                y += d->actionRects.at(i).height();
+            }
+        }
         if (nextAction) {
             if (d->scroll && scroll_loc != QMenuPrivate::QMenuScroller::ScrollStay) {
+                if (d->scroll->scrollTimer)
+                    d->scroll->scrollTimer->stop();
+                d->scroll->scrollTimer.stop();
                 d->scrollMenu(nextAction, scroll_loc);
+            }
 …
             d->hideMenu(this);
 #ifndef QT_NO_MENUBAR
             if (QMenuBar *mb = qobject_cast<QMenuBar*>(qApp->focusWidget())) {
+            if (QMenuBar *mb = qobject_cast<QMenuBar*>(QApplication::focusWidget())) {
                 mb->d_func()->setKeyboardMode(false);
+            }
 …
                 d->searchBufferTimer.start(2000, this);
                 d->searchBuffer += e->text();
                 for(int i = 0; i < d->actionList.size(); ++i) {
+                for(int i = 0; i < d->actions.size(); ++i) {
                     int match_count = 0;
+                    register QAction *act = d->actionList.at(i);
+                    if (d->actionRects.at(i).isNull())
+                        continue;
+                    QAction *act = d->actions.at(i);
                     const QString act_text = act->text();
                     for(int c = 0; c < d->searchBuffer.size(); ++c) {
 …
                 QAction *first = 0, *currentSelected = 0, *firstAfterCurrent = 0;
                 QChar c = e->text().at(0).toUpper();
+                for(int i = 0; i < d->actionList.size(); ++i) {
+                    register QAction *act = d->actionList.at(i);
+                for(int i = 0; i < d->actions.size(); ++i) {
+                    if (d->actionRects.at(i).isNull())
+                        continue;
+                    QAction *act = d->actions.at(i);
                     QKeySequence sequence = QKeySequence::mnemonic(act->text());
                     int key = sequence[0] & 0xffff;
 …
+        }
         if (!key_consumed) {
-            if (QWidget *caused = d->causedPopup.widget) {
-                while(QMenu *m = qobject_cast<QMenu*>(caused))
-                    caused = m->d_func()->causedPopup.widget;
 #ifndef QT_NO_MENUBAR
+                if (QMenuBar *mb = qobject_cast<QMenuBar*>(caused)) {
+                    QAction *oldAct = mb->d_func()->currentAction;
+                    QApplication::sendEvent(mb, e);
+                    if (mb->d_func()->currentAction != oldAct)
+                        key_consumed = true;
+                }
+#endif
+            if (QMenuBar *mb = qobject_cast<QMenuBar*>(d->topCausedWidget())) {
+                QAction *oldAct = mb->d_func()->currentAction;
+                QApplication::sendEvent(mb, e);
+                if (mb->d_func()->currentAction != oldAct)
+                    key_consumed = true;
+            }
+#endif
+        }
 #ifdef Q_OS_WIN32
         if (key_consumed && (e->key() == Qt::Key_Control || e->key() == Qt::Key_Shift || e->key() == Qt::Key_Meta))
             qApp->beep();
+            QApplication::beep();
 #endif // Q_OS_WIN32
+    }
 …
     if (d->motions == 0) // ignore first mouse move event (see enterEvent())
         return;
     d->hasHadMouse |= rect().contains(e->pos());
+    d->hasHadMouse = d->hasHadMouse || rect().contains(e->pos());
     QAction *action = d->actionAt(e->pos());
     if (!action) {
         if (d->hasHadMouse && !rect().contains(e->pos()))
+        if (d->hasHadMouse)
             d->setCurrentAction(0);
         return;
     } else if(e->buttons() & (Qt::LeftButton | Qt::RightButton)) {
+    } else if(e->buttons()) {
         d->mouseDown = this;
+    }
 …
     if (!d->sloppyRegion.isEmpty())
         d->sloppyRegion = QRegion();
+    if (!d->activeMenu && d->currentAction)
+        setActiveAction(0);
+}
 …
+{
     Q_D(QMenu);
     if (d->scroll && d->scroll->scrollTimer && d->scroll->scrollTimer->timerId() == e->timerId()) {
+    if (d->scroll && d->scroll->scrollTimer.timerId() == e->timerId()) {
         d->scrollMenu((QMenuPrivate::QMenuScroller::ScrollDirection)d->scroll->scrollDirection);
         if (d->scroll->scrollFlags == QMenuPrivate::QMenuScroller::ScrollNone)
             d->scroll->scrollTimer->stop();
+            d->scroll->scrollTimer.stop();
     } else if(QMenuPrivate::menuDelayTimer.timerId() == e->timerId()) {
         QMenuPrivate::menuDelayTimer.stop();
 …
             connect(e->action(), SIGNAL(hovered()), this, SLOT(_q_actionHovered()));
+        }
         if (QWidgetAction *wa = qobject_cast<QWidgetAction *>(e->action())) {
             QWidget *widget = wa->requestWidget(this);
 …
+        }
     } else if (e->type() == QEvent::ActionRemoved) {
-        d->actionRects.clear();
-        d->actionList.clear();
         e->action()->disconnect(this);
         if (e->action() == d->currentAction)
             d->currentAction = 0;
         if (QWidgetAction *wa = qobject_cast<QWidgetAction *>(e->action())) {
+            QWidget *widget = d->widgetItems.take(wa);
+            if (widget)
+            if (QWidget *widget = d->widgetItems.value(wa))
                 wa->releaseWidget(widget);
+        } else {
+            // If this is called from the QAction destructor, the
+            // previous call to qobject_cast will fail because the
+            // QWidgetAction has been destroyed already. We need to
+            // remove it from the hash anyway or it might crash later
+            // the widget itself has been already destroyed in
+            // ~QWidgetAction
+            d->widgetItems.remove(e->action());
+        }
+        }
+        d->widgetItems.remove(e->action());
+    }
 …
 #endif
 #if defined(Q_OS_WINCE) && !defined(QT_NO_MENUBAR)
+#if defined(Q_WS_WINCE) && !defined(QT_NO_MENUBAR)
     if (!d->wce_menu)
         d->wce_menu = new QMenuPrivate::QWceMenuPrivate;
 …
 #endif
+#ifdef Q_WS_S60
+    if (!d->symbian_menu)
+        d->symbian_menu = new QMenuPrivate::QSymbianMenuPrivate;
+    if (e->type() == QEvent::ActionAdded)
+        d->symbian_menu->addAction(e->action(), d->symbian_menu->findAction(e->before()));
+    else if (e->type() == QEvent::ActionRemoved)
+        d->symbian_menu->removeAction(e->action());
+    else if (e->type() == QEvent::ActionChanged)
+        d->symbian_menu->syncAction(e->action());
+#endif
     if (isVisible()) {
         d->updateActions();
+        d->updateActionRects();
         resize(sizeHint());
         update();
 …
     QMenu *caused = qobject_cast<QMenu*>(d->activeMenu->d_func()->causedPopup.widget);
     const QRect availGeometry(d->popupGeometry(QApplication::desktop()->screenNumber(caused)));
+    const QRect availGeometry(d->popupGeometry(caused));
     if (isRightToLeft()) {
         pos = leftPos;
 …
+{
     Q_D(QMenu);
+    if (d->collapsibleSeparators == collapse)
+        return;
     d->collapsibleSeparators = collapse;
     d->itemsDirty = 1;
     if (isVisible()) {
         d->updateActions();
+        d->updateActionRects();
         update();
+    }
+#ifdef Q_WS_MAC
+    if (d->mac_menu)
+        d->syncSeparatorsCollapsible(collapse);
+#endif
+}
 …
 QAction *QMenu::findActionForId(int id) const
+{
     QList<QAction *> list = actions();
     for (int i = 0; i < list.size(); ++i) {
         QAction *act = list.at(i);
+    Q_D(const QMenu);
+    for (int i = 0; i < d->actions.size(); ++i) {
+        QAction *act = d->actions.at(i);
         if (findIdForAction(act)== id)
             return act;

trunk/src/gui/widgets/qmenu.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #endif
 #ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
     HMENU wceMenu(bool create = false);
 #endif
     bool separatorsCollapsible() const;
 …
     void initStyleOption(QStyleOptionMenuItem *option, const QAction *action) const;
 #ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
     QAction* wceCommands(uint command);
 #endif

trunk/src/gui/widgets/qmenu_mac.mm

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
   QMenu globals
  *****************************************************************************/
-bool qt_mac_no_native_menubar = false;
 bool qt_mac_no_menubar_merge = false;
 bool qt_mac_quit_menu_item_enabled = true;
 …
+}
+static quint32 constructModifierMask(quint32 accel_key)
+{
+    quint32 ret = 0;
+    const bool dontSwap = qApp->testAttribute(Qt::AA_MacDontSwapCtrlAndMeta);
+#ifndef QT_MAC_USE_COCOA
+    if ((accel_key & Qt::ALT) == Qt::ALT)
+        ret |= kMenuOptionModifier;
+    if ((accel_key & Qt::SHIFT) == Qt::SHIFT)
+        ret |= kMenuShiftModifier;
+    if (dontSwap) {
+        if ((accel_key & Qt::META) != Qt::META)
+            ret |= kMenuNoCommandModifier;
+        if ((accel_key & Qt::CTRL) == Qt::CTRL)
+            ret |= kMenuControlModifier;
+    } else {
+        if ((accel_key & Qt::CTRL) != Qt::CTRL)
+            ret |= kMenuNoCommandModifier;
+        if ((accel_key & Qt::META) == Qt::META)
+            ret |= kMenuControlModifier;
+    }
+#else
+    if ((accel_key & Qt::CTRL) == Qt::CTRL)
+        ret |= (dontSwap ? NSControlKeyMask : NSCommandKeyMask);
+    if ((accel_key & Qt::META) == Qt::META)
+        ret |= (dontSwap ? NSCommandKeyMask : NSControlKeyMask);
+    if ((accel_key & Qt::ALT) == Qt::ALT)
+        ret |= NSAlternateKeyMask;
+    if ((accel_key & Qt::SHIFT) == Qt::SHIFT)
+        ret |= NSShiftKeyMask;
+#endif
+    return ret;
+}
 static bool actualMenuItemVisibility(const QMenuBarPrivate::QMacMenuBarPrivate *mbp,
                                      const QMacMenuAction *action)
 …
         GetMenuItemProperty(menu, 0, kMenuCreatorQt, kMenuPropertyMergeList,
                             sizeof(list), 0, &list);
         if (!list && qt_mac_current_menubar.qmenubar) {
+        if (!list && qt_mac_current_menubar.qmenubar && qt_mac_current_menubar.qmenubar->isNativeMenuBar()) {
             MenuRef apple_menu = qt_mac_current_menubar.qmenubar->d_func()->mac_menubar->apple_menu;
             GetMenuItemProperty(apple_menu, 0, kMenuCreatorQt, kMenuPropertyMergeList, sizeof(list), 0, &list);
 …
                         int merged = 0;
                         const QMenuPrivate::QMacMenuPrivate *mac_menu = qmenu->d_func()->mac_menu;
+                        for(int i = 0; i < mac_menu->actionItems.size(); ++i) {
+                        const int ActionItemsCount = mac_menu->actionItems.size();
+                        for(int i = 0; i < ActionItemsCount; ++i) {
                             QMacMenuAction *action = mac_menu->actionItems.at(i);
                             if (action->action->isSeparator()) {
 …
 static void qt_mac_get_accel(quint32 accel_key, quint32 *modif, quint32 *key) {
     if (modif) {
+        *modif = 0;
+        if ((accel_key & Qt::CTRL) != Qt::CTRL)
+            *modif |= kMenuNoCommandModifier;
+        if ((accel_key & Qt::META) == Qt::META)
+            *modif |= kMenuControlModifier;
+        if ((accel_key & Qt::ALT) == Qt::ALT)
+            *modif |= kMenuOptionModifier;
+        if ((accel_key & Qt::SHIFT) == Qt::SHIFT)
+            *modif |= kMenuShiftModifier;
+        *modif = constructModifierMask(accel_key);
+    }
 …
+}
+static inline void syncNSMenuItemEnabled(NSMenuItem *menuItem, bool enabled)
+{
+    [menuItem setEnabled:NO];
+    [menuItem setEnabled:YES];
+    [menuItem setEnabled:enabled];
+}
 static inline void syncMenuBarItemsVisiblity(const QMenuBarPrivate::QMacMenuBarPrivate *mac_menubar)
+{
 …
+{
     NSMenuItem *item = [[NSMenuItem alloc]
                          initWithTitle:reinterpret_cast<const NSString *>(static_cast<CFStringRef>(QCFString(title)))
+                         initWithTitle:qt_mac_QStringToNSString(title)
                          action:@selector(qtDispatcherToQAction:) keyEquivalent:@""];
     [item setTarget:getMenuLoader()];
 …
                 if ([item tag]) {
                     QAction *action = reinterpret_cast<QAction *>([item tag]);
                     [item setEnabled:action->isEnabled()];
+                     syncNSMenuItemEnabled(item, action->isEnabled());
                  } else {
                      [item setEnabled:YES];
+                     syncNSMenuItemEnabled(item, YES);
+                 }
             } else {
                 [item setEnabled:NO];
+                syncNSMenuItemEnabled(item, NO);
+            }
+        }
 …
 void qt_mac_clear_menubar()
+{
+    if (QApplication::testAttribute(Qt::AA_MacPluginApplication))
+        return;
 #ifndef QT_MAC_USE_COCOA
     MenuRef clear_menu = 0;
 …
 #ifdef QT_MAC_USE_COCOA
     [menu release];
+    [menuItem setTag:nil];
+    // Update the menu item if this action still owns it. For some items
+    // (like 'Quit') ownership will be transferred between all menu bars...
+    if (action && action.data() == reinterpret_cast<QAction *>([menuItem tag])) {
+        QAction::MenuRole role = action->menuRole();
+        // Check if the item is owned by Qt, and should be hidden to keep it from causing
+        // problems. Do it for everything but the quit menu item since that should always
+        // be visible.
+        if (role > QAction::ApplicationSpecificRole && role < QAction::QuitRole) {
+            [menuItem setHidden:YES];
+        } else if (role == QAction::TextHeuristicRole
+                   && menuItem != [getMenuLoader() quitMenuItem]) {
+            [menuItem setHidden:YES];
+        }
+        [menuItem setTag:nil];
+    }
     [menuItem release];
 #endif
 …
+    }
-    if ([ret tag] != 0)
-        ret = 0; // already taken
 #endif
     return ret;
 …
 #ifndef QT_MAC_USE_COCOA
     else if (action->command == kHICommandPreferences)
         ret = QKeySequence(Qt::CTRL+Qt::Key_Comma);
+        ret = QKeySequence(QKeySequence::Preferences);
     else if (action->command == kHICommandQuit)
         ret = QKeySequence(Qt::CTRL+Qt::Key_Q);
+        ret = QKeySequence(QKeySequence::Quit);
 #else
     else if (action->menuItem == [loader preferencesMenuItem])
         ret = QKeySequence(Qt::CTRL+Qt::Key_Comma);
+        ret = QKeySequence(QKeySequence::Preferences);
     else if (action->menuItem == [loader quitMenuItem])
         ret = QKeySequence(Qt::CTRL+Qt::Key_Q);
+        ret = QKeySequence(QKeySequence::Quit);
 #endif
     return ret;
 …
 void Q_GUI_EXPORT qt_mac_set_menubar_icons(bool b)
 { QApplication::instance()->setAttribute(Qt::AA_DontShowIconsInMenus, !b); }
+void Q_GUI_EXPORT qt_mac_set_native_menubar(bool b) { qt_mac_no_native_menubar = !b; }
+void Q_GUI_EXPORT qt_mac_set_native_menubar(bool b)
+{  QApplication::instance()->setAttribute(Qt::AA_DontUseNativeMenuBar, !b); }
 void Q_GUI_EXPORT qt_mac_set_menubar_merge(bool b) { qt_mac_no_menubar_merge = !b; }
 …
             if (mergedItems.contains(action->command)
                  && (testattr & kMenuItemAttrSeparator)) {
                     InsertMenuItemTextWithCFString(action->menu, 0, qMax(itemCount - 1, 0), attr, action->command);
                     index = itemCount;
                  } else {
                     MenuItemIndex tmpIndex;
                     AppendMenuItemTextWithCFString(action->menu, 0, attr, action->command, &tmpIndex);
                     index = tmpIndex;
                     if (mergedItems.contains(action->command))
                         AppendMenuItemTextWithCFString(action->menu, 0, kMenuItemAttrSeparator, 0, &tmpIndex);
+                 }
+                InsertMenuItemTextWithCFString(action->menu, 0, qMax(itemCount - 1, 0), attr, action->command);
+                index = itemCount;
+            } else {
+                MenuItemIndex tmpIndex;
+                AppendMenuItemTextWithCFString(action->menu, 0, attr, action->command, &tmpIndex);
+                index = tmpIndex;
+                if (mergedItems.contains(action->command))
+                    AppendMenuItemTextWithCFString(action->menu, 0, kMenuItemAttrSeparator, 0, &tmpIndex);
+            }
 #else
             [menu addItem:newItem];
 …
+{
     quint32 accel_key = (accel[0] & ~(Qt::MODIFIER_MASK | Qt::UNICODE_ACCEL));
+    unichar keyEquiv[1] = { 0 };
+    if (accel_key == Qt::Key_Return)
+        keyEquiv[0] = kReturnCharCode;
+    else if (accel_key == Qt::Key_Enter)
+        keyEquiv[0] = kEnterCharCode;
+    else if (accel_key == Qt::Key_Tab)
+        keyEquiv[0] = kTabCharCode;
+    else if (accel_key == Qt::Key_Backspace)
+        keyEquiv[0] = kBackspaceCharCode;
+    else if (accel_key == Qt::Key_Delete)
+        keyEquiv[0] = NSDeleteFunctionKey;
+    else if (accel_key == Qt::Key_Escape)
+        keyEquiv[0] = kEscapeCharCode;
+    else if (accel_key == Qt::Key_PageUp)
+        keyEquiv[0] = NSPageUpFunctionKey;
+    else if (accel_key == Qt::Key_PageDown)
+        keyEquiv[0] = NSPageDownFunctionKey;
+    else if (accel_key == Qt::Key_Up)
+        keyEquiv[0] = NSUpArrowFunctionKey;
+    else if (accel_key == Qt::Key_Down)
+        keyEquiv[0] = NSDownArrowFunctionKey;
+    else if (accel_key == Qt::Key_Left)
+        keyEquiv[0] = NSLeftArrowFunctionKey;
+    else if (accel_key == Qt::Key_Right)
+        keyEquiv[0] = NSRightArrowFunctionKey;
+    else if (accel_key == Qt::Key_CapsLock)
+        keyEquiv[0] = kMenuCapsLockGlyph;  // ### Cocoa has no equivalent
+    else if (accel_key >= Qt::Key_F1 && accel_key <= Qt::Key_F15)
+        keyEquiv[0] = (accel_key - Qt::Key_F1) + NSF1FunctionKey;
+    else if (accel_key == Qt::Key_Home)
+        keyEquiv[0] = NSHomeFunctionKey;
+    else if (accel_key == Qt::Key_End)
+        keyEquiv[0] = NSEndFunctionKey;
+    else
+        keyEquiv[0] = unichar(QChar(accel_key).toLower().unicode());
+    return [NSString stringWithCharacters:keyEquiv length:1];
+    extern QChar qt_macSymbolForQtKey(int key); // qkeysequence.cpp
+    QChar keyEquiv = qt_macSymbolForQtKey(accel_key);
+    if (keyEquiv.isNull()) {
+        if (accel_key >= Qt::Key_F1 && accel_key <= Qt::Key_F15)
+            keyEquiv = (accel_key - Qt::Key_F1) + NSF1FunctionKey;
+        else
+            keyEquiv = unichar(QChar(accel_key).toLower().unicode());
+    }
+    return [NSString stringWithCharacters:&keyEquiv.unicode() length:1];
+}
 …
 NSUInteger keySequenceModifierMask(const QKeySequence &accel)
+{
+    NSUInteger ret = 0;
+    quint32 accel_key = accel[0];
+    if ((accel_key & Qt::CTRL) == Qt::CTRL)
+        ret |= NSCommandKeyMask;
+    if ((accel_key & Qt::META) == Qt::META)
+        ret |= NSControlKeyMask;
+    if ((accel_key & Qt::ALT) == Qt::ALT)
+        ret |= NSAlternateKeyMask;
+    if ((accel_key & Qt::SHIFT) == Qt::SHIFT)
+        ret |= NSShiftKeyMask;
+    return ret;
+    return constructModifierMask(accel[0]);
+}
 …
+        }
+    }
+    // Show multiple key sequences as part of the menu text.
     if (accel.count() > 1)
         text += QLatin1String(" (****)"); //just to denote a multi stroke shortcut
+        text += QLatin1String(" (") + accel.toString(QKeySequence::NativeText) + QLatin1String(")");
     QString finalString = qt_mac_removeMnemonics(text);
 …
             && action->action->isIconVisibleInMenu()) {
         data.iconType = kMenuIconRefType;
         data.iconHandle = (Handle)qt_mac_create_iconref(action->action->icon().pixmap(22, QIcon::Normal));
+        data.iconHandle = (Handle)qt_mac_create_iconref(action->action->icon().pixmap(16, QIcon::Normal));
     } else {
         data.iconType = kMenuNoIcon;
 …
     if (action->action->font().resolve()) {
         const QFont &actionFont = action->action->font();
         NSFont *customMenuFont = [NSFont fontWithName:reinterpret_cast<const NSString *>(static_cast<CFStringRef>(QCFString(actionFont.family())))
+        NSFont *customMenuFont = [NSFont fontWithName:qt_mac_QStringToNSString(actionFont.family())
                                   size:actionFont.pointSize()];
         NSArray *keys = [NSArray arrayWithObjects:NSFontAttributeName, nil];
         NSArray *objects = [NSArray arrayWithObjects:customMenuFont, nil];
         NSDictionary *attributes = [NSDictionary dictionaryWithObjects:objects forKeys:keys];
         NSAttributedString *str = [[[NSAttributedString alloc] initWithString:reinterpret_cast<const NSString *>(static_cast<CFStringRef>(QCFString(finalString)))
+        NSAttributedString *str = [[[NSAttributedString alloc] initWithString:qt_mac_QStringToNSString(finalString)
                                  attributes:attributes] autorelease];
        [item setAttributedTitle: str];
     } else {
         [item setTitle: reinterpret_cast<const NSString *>(static_cast<CFStringRef>(QCFString(finalString)))];
+    }
     [item setTitle:reinterpret_cast<const NSString *>(static_cast<CFStringRef>(QCFString(qt_mac_removeMnemonics(text))))];
+        [item setTitle: qt_mac_QStringToNSString(finalString)];
+    }
+    [item setTitle:qt_mac_QStringToNSString(qt_mac_removeMnemonics(text))];
     // Cocoa Enabled
 …
     NSImage *nsimage = 0;
     if (!action->action->icon().isNull() && action->action->isIconVisibleInMenu()) {
         nsimage = static_cast<NSImage *>(qt_mac_create_nsimage(action->action->icon().pixmap(22, QIcon::Normal)));
+        nsimage = static_cast<NSImage *>(qt_mac_create_nsimage(action->action->icon().pixmap(16, QIcon::Normal)));
+    }
     [item setImage:nsimage];
 …
         SetMenuItemProperty(data.submenuHandle, 0, kMenuCreatorQt, kMenuPropertyCausedQWidget, sizeof(caused), &caused);
 #else
+        [item setSubmenu:static_cast<NSMenu *>(action->action->menu()->macMenu())];
+        NSMenu *subMenu  = static_cast<NSMenu *>(action->action->menu()->macMenu());
+        if ([subMenu supermenu] && [subMenu supermenu] != [item menu]) {
+            // The menu is already a sub-menu of another one. Cocoa will throw an exception,
+            // in such cases. For the time being, a new QMenu with same set of actions is the
+            // only workaround.
+            action->action->setEnabled(false);
+        } else {
+            [item setSubmenu:subMenu];
+        }
 #endif
     } else { //respect some other items
 …
         data.whichData |= kMenuItemDataCmdKeyModifiers;
         data.whichData |= kMenuItemDataCmdKeyGlyph;
         if (!accel.isEmpty()) {
+        if (accel.count() == 1) {
             qt_mac_get_accel(accel[0], (quint32*)&data.cmdKeyModifiers, (quint32*)&data.cmdKeyGlyph);
             if (data.cmdKeyGlyph == 0)
 …
 #else
         [item setSubmenu:0];
+        if (!accel.isEmpty()) {
+        // No key equivalent set for multiple key QKeySequence.
+        if (accel.count() == 1) {
             [item setKeyEquivalent:keySequenceToKeyEqivalent(accel)];
             [item setKeyEquivalentModifierMask:keySequenceModifierMask(accel)];
 …
 #else
     QMacCocoaAutoReleasePool pool;
+    QT_MANGLE_NAMESPACE(QCocoaMenuLoader) *loader = getMenuLoader();
+    if (action->menuItem == [loader quitMenuItem] || action->menuItem == [loader preferencesMenuItem])
+        [action->menuItem setEnabled:false];
+    else
+    if (action->merged) {
+        if (reinterpret_cast<QAction *>([action->menuItem tag]) == action->action) {
+            QT_MANGLE_NAMESPACE(QCocoaMenuLoader) *loader = getMenuLoader();
+            [action->menuItem setEnabled:false];
+            if (action->menuItem != [loader quitMenuItem]
+                && action->menuItem != [loader preferencesMenuItem]) {
+                [[action->menuItem menu] removeItem:action->menuItem];
+            }
+        }
+    } else {
         [[action->menuItem menu] removeItem:action->menuItem];
+    }
 #endif
     actionItems.removeAll(action);
 …
     for(int i = 0; i < items.count(); i++)
         mac_menu->addAction(items[i], 0, this);
+    syncSeparatorsCollapsible(collapsibleSeparators);
     return mac_menu->menu;
+}
+/*!
+  \internal
+*/
+void
+QMenuPrivate::syncSeparatorsCollapsible(bool collapse)
+{
+#ifndef QT_MAC_USE_COCOA
+    if (collapse)
+        ChangeMenuAttributes(mac_menu->menu, kMenuAttrCondenseSeparators, 0);
+    else
+        ChangeMenuAttributes(mac_menu->menu, 0, kMenuAttrCondenseSeparators);
+#else
+    qt_mac_menu_collapseSeparators(mac_menu->menu, collapse);
+#endif
+}
 /*!
 …
             SetMenuItemProperty(submenu, 0, kMenuCreatorQt, kMenuPropertyCausedQWidget, sizeof(caused), &caused);
 #else
+            [item setSubmenu:submenu];
+            if ([submenu supermenu] && [submenu supermenu] != [item menu])
+                return;
+            else
+                [item setSubmenu:submenu];
 #endif
+        }
 …
 #else
         [item setSubmenu: submenu];
         [submenu setTitle:reinterpret_cast<const NSString *>(static_cast<CFStringRef>(QCFString(qt_mac_removeMnemonics(action->action->text()))))];
+        [submenu setTitle:qt_mac_QStringToNSString(qt_mac_removeMnemonics(action->action->text()))];
         syncNSMenuItemVisiblity(item, visible);
 #endif
 …
+}
+bool QMenuBarPrivate::macWidgetHasNativeMenubar(QWidget *widget)
+{
+    // This function is different from q->isNativeMenuBar(), as
+    // it returns true only if a native menu bar is actually
+    // _created_.
+    if (!widget)
+        return false;
+    return menubars()->contains(widget->window());
+}
 void
 QMenuBarPrivate::macCreateMenuBar(QWidget *parent)
+{
     Q_Q(QMenuBar);
+    static int checkEnv = -1;
+    if (qt_mac_no_native_menubar == false && checkEnv < 0) {
+        checkEnv = !qgetenv("QT_MAC_NO_NATIVE_MENUBAR").isEmpty();
+        qt_mac_no_native_menubar = checkEnv;
+    }
+    if (!qt_mac_no_native_menubar) {
+    static int dontUseNativeMenuBar = -1;
+    // We call the isNativeMenuBar function here
+    // because that will make sure that local overrides
+    // are dealt with correctly. q->isNativeMenuBar() will, if not
+    // overridden, depend on the attribute Qt::AA_DontUseNativeMenuBar:
+    bool qt_mac_no_native_menubar = !q->isNativeMenuBar();
+    if (qt_mac_no_native_menubar == false && dontUseNativeMenuBar < 0) {
+        // The menubar is set to be native. Let's check (one time only
+        // for all menubars) if this is OK with the rest of the environment.
+        // As a result, Qt::AA_DontUseNativeMenuBar is set. NB: the application
+        // might still choose to not respect, or change, this flag.
+        bool isPlugin = QApplication::testAttribute(Qt::AA_MacPluginApplication);
+        bool environmentSaysNo = !qgetenv("QT_MAC_NO_NATIVE_MENUBAR").isEmpty();
+        dontUseNativeMenuBar = isPlugin || environmentSaysNo;
+        QApplication::instance()->setAttribute(Qt::AA_DontUseNativeMenuBar, dontUseNativeMenuBar);
+        qt_mac_no_native_menubar = !q->isNativeMenuBar();
+    }
+    if (qt_mac_no_native_menubar == false) {
+        // INVARIANT: Use native menubar.
         extern void qt_event_request_menubarupdate(); //qapplication_mac.cpp
         qt_event_request_menubarupdate();
 …
+{
     Q_Q(QMenuBar);
     if (!mac_menubar) {
+    if (!q->isNativeMenuBar() || !mac_menubar) {
         return 0;
     } else if (!mac_menubar->menu) {
 …
                 SetMenuItemProperty(mac_menubar->apple_menu, 0, kMenuCreatorQt, kMenuPropertyQWidget, sizeof(q), &q);
 #else
                 [mac_menubar->apple_menu setTitle:reinterpret_cast<const NSString *>(static_cast<CFStringRef>(QCFString(QString(QChar(0x14)))))];
+                [mac_menubar->apple_menu setTitle:qt_mac_QStringToNSString(QString(QChar(0x14)))];
                 NSMenuItem *apple_menuItem = [[NSMenuItem alloc] init];
                 [apple_menuItem setSubmenu:mac_menubar->menu];
 …
 static bool qt_mac_is_ancestor(QWidget* possibleAncestor, QWidget *child)
+{
+    if (!possibleAncestor)
+        return false;
     QWidget * current = child->parentWidget();
     while (current != 0) {
 …
     if (modalWidget == 0 || menuBar == 0)
         return false;
+    const Qt::WindowModality modality = modalWidget->windowModality();
+    if (modality == Qt::ApplicationModal) {
+        return true;
+    } else if (modality == Qt::WindowModal) {
+        QWidget * parent = menuBar->parentWidget();
+        // Special case for the global menu bar: It's not associated
+        // with a window so don't disable it.
+        if (parent == 0)
+            return false;
+        // Disable menu entries in menu bars that belong to ancestors of
+        // the modal widget, leave entries in unrelated menu bars enabled.
+        return qt_mac_is_ancestor(parent, modalWidget);
+    }
+    return false; // modality == NonModal
+    // If there is an application modal window on
+    // screen, the entries of the menubar should be disabled:
+    QWidget *w = modalWidget;
+    while (w) {
+        if (w->isVisible() && w->windowModality() == Qt::ApplicationModal)
+            return true;
+        w = w->parentWidget();
+    }
+    // INVARIANT: modalWidget is window modal. Disable menu entries
+    // if the menu bar belongs to an ancestor of modalWidget:
+    return qt_mac_is_ancestor(menuBar->parentWidget(), modalWidget);
+}
 …
 bool QMenuBar::macUpdateMenuBar()
+{
-    if (qt_mac_no_native_menubar) //nothing to be done..
-        return true;
     cancelAllMenuTracking();
     QMenuBar *mb = 0;
 …
     //now set it
     bool ret = false;
     if (mb) {
+    if (mb && mb->isNativeMenuBar()) {
 #ifdef QT_MAC_USE_COCOA
         QMacCocoaAutoReleasePool pool;
 …
             [NSApp setMainMenu:menu];
             syncMenuBarItemsVisiblity(mb->d_func()->mac_menubar);
+            if (OSMenuRef tmpMerge = QMenuPrivate::mergeMenuHash.value(menu)) {
+                if (QMenuMergeList *mergeList
+                        = QMenuPrivate::mergeMenuItemsHash.value(tmpMerge)) {
+                    const int mergeListSize = mergeList->size();
+                    for (int i = 0; i < mergeListSize; ++i) {
+                        const QMenuMergeItem &mergeItem = mergeList->at(i);
+                        // Ideally we would call QMenuPrivate::syncAction, but that requires finding
+                        // the original QMen and likely doing more work than we need.
+                        // For example, enabled is handled below.
+                        [mergeItem.menuItem setTag:reinterpret_cast<long>(
+                                                    static_cast<QAction *>(mergeItem.action->action))];
+                        [mergeItem.menuItem setHidden:!(mergeItem.action->action->isVisible())];
+                    }
+                }
+            }
 #endif
             QWidget *modalWidget = qApp->activeModalWidget();
 …
         qt_mac_current_menubar.modal = QApplicationPrivate::modalState();
         ret = true;
     } else if (qt_mac_current_menubar.qmenubar) {
+    } else if (qt_mac_current_menubar.qmenubar && qt_mac_current_menubar.qmenubar->isNativeMenuBar()) {
         const bool modal = QApplicationPrivate::modalState();
         if (modal != qt_mac_current_menubar.modal) {

trunk/src/gui/widgets/qmenu_p.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #include "private/qwidget_p.h"
+#ifdef Q_WS_S60
+class CEikMenuPane;
+#define QT_SYMBIAN_FIRST_MENU_ITEM 32000
+#define QT_SYMBIAN_LAST_MENU_ITEM 41999 // 10000 items ought to be enough for anybody...
+#endif
 QT_BEGIN_NAMESPACE
 #ifndef QT_NO_MENU
+#ifdef Q_WS_S60
+void qt_symbian_show_toplevel(CEikMenuPane* menuPane);
+void qt_symbian_show_submenu(CEikMenuPane* menuPane, int id);
+#endif // Q_WS_S60
 class QTornOffMenu;
 …
 #endif
 #ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
 struct QWceMenuAction {
     uint command;
 …
 };
 #endif
+#ifdef Q_WS_S60
+struct QSymbianMenuAction {
+    uint command;
+    int parent;
+    CEikMenuPane* menuPane;
+    QPointer<QAction> action;
+    QSymbianMenuAction() : command(0) {}
+};
+#endif
 class QMenuPrivate : public QWidgetPrivate
 …
 public:
     QMenuPrivate() : itemsDirty(0), maxIconWidth(0), tabWidth(0), ncols(0),
+                      collapsibleSeparators(true), hasHadMouse(0), aboutToHide(0), motions(0),
+                      currentAction(0), scroll(0), eventLoop(0), tearoff(0), tornoff(0), tearoffHighlighted(0),
+                      hasCheckableItems(0), sloppyAction(0)
+                      collapsibleSeparators(true), activationRecursionGuard(false), hasHadMouse(0), aboutToHide(0), motions(0),
+                      currentAction(0),
+#ifdef QT_KEYPAD_NAVIGATION
+                      selectAction(0),
+                      cancelAction(0),
+#endif
+                      scroll(0), eventLoop(0), tearoff(0), tornoff(0), tearoffHighlighted(0),
+                      hasCheckableItems(0), sloppyAction(0), doChildEffects(false)
 #ifdef Q_WS_MAC
                       ,mac_menu(0)
 #endif
 #if defined(Q_OS_WINCE) && !defined(QT_NO_MENUBAR)
+#if defined(Q_WS_WINCE) && !defined(QT_NO_MENUBAR)
                       ,wce_menu(0)
+#endif
+#ifdef Q_WS_S60
+                      ,symbian_menu(0)
 #endif
 #ifdef QT3_SUPPORT
 …
         delete mac_menu;
 #endif
 #if defined(Q_OS_WINCE) && !defined(QT_NO_MENUBAR)
+#if defined(Q_WS_WINCE) && !defined(QT_NO_MENUBAR)
         delete wce_menu;
 #endif
+#ifdef Q_WS_S60
+        delete symbian_menu;
+#endif
+    }
     void init();
+    static QMenuPrivate *get(QMenu *m) { return m->d_func(); }
+    int scrollerHeight() const;
     //item calculations
 …
     mutable uint maxIconWidth, tabWidth;
     QRect actionRect(QAction *) const;
+    mutable QMap<QAction*, QRect> actionRects;
     mutable QList<QAction*> actionList;
+    mutable QVector<QRect> actionRects;
     mutable QHash<QAction *, QWidget *> widgetItems;
+    void calcActionRects(QMap<QAction*, QRect> &actionRects, QList<QAction*> &actionList) const;
+    void updateActions();
+    QRect popupGeometry(int screen=-1) const;
+    QList<QAction *> filterActions(const QList<QAction *> &actions) const;
+    uint ncols : 4; //4 bits is probably plenty
+    void updateActionRects() const;
+    QRect popupGeometry(const QWidget *widget) const;
+    QRect popupGeometry(int screen = -1) const;
+    mutable uint ncols : 4; //4 bits is probably plenty
     uint collapsibleSeparators : 1;
     uint activationRecursionGuard : 1;
+    bool activationRecursionGuard;
     //selection
 …
     int motions;
     QAction *currentAction;
+#ifdef QT_KEYPAD_NAVIGATION
+    QAction *selectAction;
+    QAction *cancelAction;
+#endif
     static QBasicTimer menuDelayTimer;
     enum SelectionReason {
 …
         SelectedFromElsewhere
     };
+    QWidget *topCausedWidget() const;
     QAction *actionAt(QPoint p) const;
     void setFirstActionActive();
 …
         uint scrollFlags : 2, scrollDirection : 2;
         int scrollOffset;
         QBasicTimer *scrollTimer;
         QMenuScroller() : scrollFlags(ScrollNone), scrollDirection(ScrollNone), scrollOffset(0), scrollTimer(0) { }
         ~QMenuScroller() { delete scrollTimer; }
+        QBasicTimer scrollTimer;
+        QMenuScroller() : scrollFlags(ScrollNone), scrollDirection(ScrollNone), scrollOffset(0) { }
+        ~QMenuScroller() { }
     } *scroll;
     void scrollMenu(QMenuScroller::ScrollLocation location, bool active=false);
 …
     QBasicTimer searchBufferTimer;
     //passing of mouse events up the parent heirarchy
+    //passing of mouse events up the parent hierarchy
     QPointer<QMenu> activeMenu;
     bool mouseEventTaken(QMouseEvent *);
 …
     QMenuCaused causedPopup;
     void hideUpToMenuBar();
     void hideMenu(QMenu *menu);
+    void hideMenu(QMenu *menu, bool justRegister = false);
     //index mappings
 …
     //sloppy selection
     static QBasicTimer sloppyDelayTimer;
     QAction *sloppyAction;
+    mutable QAction *sloppyAction;
     QRegion sloppyRegion;
 …
     bool hasMouseMoved(const QPoint &globalPos);
+    void updateLayoutDirection();
     //menu fading/scrolling effects
 …
     OSMenuRef macMenu(OSMenuRef merge);
     void setMacMenuEnabled(bool enable = true);
+    void syncSeparatorsCollapsible(bool collapsible);
     static QHash<OSMenuRef, OSMenuRef> mergeMenuHash;
     static QHash<OSMenuRef, QMenuMergeList*> mergeMenuItemsHash;
 …
 #endif
 #if defined(Q_OS_WINCE) && !defined(QT_NO_MENUBAR)
+#if defined(Q_WS_WINCE) && !defined(QT_NO_MENUBAR)
     struct QWceMenuPrivate {
         QList<QWceMenuAction*> actionItems;
 …
     QAction* wceCommands(uint command);
 #endif
+#if defined(Q_WS_S60)
+    struct QSymbianMenuPrivate {
+        QList<QSymbianMenuAction*> actionItems;
+        QSymbianMenuPrivate();
+        ~QSymbianMenuPrivate();
+        void addAction(QAction *, QSymbianMenuAction* =0);
+        void addAction(QSymbianMenuAction *, QSymbianMenuAction* =0);
+        void syncAction(QSymbianMenuAction *);
+        inline void syncAction(QAction *a) { syncAction(findAction(a)); }
+        void removeAction(QSymbianMenuAction *);
+        void rebuild(bool reCreate = false);
+        inline void removeAction(QAction *a) { removeAction(findAction(a)); }
+        inline QSymbianMenuAction *findAction(QAction *a) {
+            for(int i = 0; i < actionItems.size(); i++) {
+                QSymbianMenuAction *act = actionItems[i];
+                if(a == act->action)
+                    return act;
+            }
+            return 0;
+        }
+    } *symbian_menu;
+#endif
     QPointer<QWidget> noReplayFor;
 };

trunk/src/gui/widgets/qmenubar.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #include "qdebug.h"
 #ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
 extern bool qt_wince_is_mobile(); //defined in qguifunctions_wce.cpp
 #endif
 …
 QAction *QMenuBarPrivate::actionAt(QPoint p) const
+{
+    Q_Q(const QMenuBar);
+    QList<QAction*> items = q->actions();
+    for(int i = 0; i < items.size(); ++i) {
+        if(actionRect(items.at(i)).contains(p))
+            return items.at(i);
+    for(int i = 0; i < actions.size(); ++i) {
+        if(actionRect(actions.at(i)).contains(p))
+            return actions.at(i);
+    }
     return 0;
 …
     if (extVisible) {
         if (q->layoutDirection() == Qt::RightToLeft)
+        if (q->isRightToLeft())
             result.setLeft(result.left() + extension->sizeHint().width());
         else
 …
     if (leftWidget && leftWidget->isVisible()) {
         QSize sz = leftWidget->sizeHint();
         if (q->layoutDirection() == Qt::RightToLeft)
+        if (q->isRightToLeft())
             result.setRight(result.right() - sz.width());
         else
 …
     if (rightWidget && rightWidget->isVisible()) {
         QSize sz = rightWidget->sizeHint();
         if (q->layoutDirection() == Qt::RightToLeft)
+        if (q->isRightToLeft())
             result.setLeft(result.left() + sz.width());
         else
 …
 #ifdef Q_WS_MAC
     if(mac_menubar) {//nothing to see here folks, move along..
+    if(q->isNativeMenuBar()) {//nothing to see here folks, move along..
         itemsDirty = false;
         return;
+    }
 #endif
+    calcActionRects(q_width, q_start, actionRects, actionList);
+    itemsWidth = q_width;
+    itemsStart = q_start;
+    calcActionRects(q_width, q_start);
     currentAction = 0;
 #ifndef QT_NO_SHORTCUT
 …
             q->releaseShortcut(shortcutIndexMap.value(j));
         shortcutIndexMap.resize(0); // faster than clear
         for(int i = 0; i < actionList.count(); i++)
             shortcutIndexMap.append(q->grabShortcut(QKeySequence::mnemonic(actionList.at(i)->text())));
+        for(int i = 0; i < actions.count(); i++)
+            shortcutIndexMap.append(q->grabShortcut(QKeySequence::mnemonic(actions.at(i)->text())));
+    }
 #endif
 …
     //we try to see if the actions will fit there
     bool hasHiddenActions = false;
+    foreach(QAction *action, actionList) {
+        if (!menuRect.contains(actionRect(action))) {
+    for (int i = 0; i < actions.count(); ++i) {
+        const QRect &rect = actionRects.at(i);
+        if (rect.isValid() && !menuRect.contains(rect)) {
             hasHiddenActions = true;
             break;
 …
     if (hasHiddenActions) {
         menuRect = this->menuRect(true);
+        foreach(QAction *action, actionList) {
+            if (!menuRect.contains(actionRect(action))) {
+                hiddenActions.append(action);
+        for (int i = 0; i < actions.count(); ++i) {
+            const QRect &rect = actionRects.at(i);
+            if (rect.isValid() && !menuRect.contains(rect)) {
+                hiddenActions.append(actions.at(i));
+            }
+        }
 …
         int vmargin = q->style()->pixelMetric(QStyle::PM_MenuBarVMargin, 0, q);
         int x = q->layoutDirection() == Qt::RightToLeft
+        int x = q->isRightToLeft()
                 ? menuRect.left() - extension->sizeHint().width() + 1
                 : menuRect.right();
 …
     q->updateGeometry();
 #ifdef QT3_SUPPORT
     if (q->parentWidget() != 0) {
+    if (parent) {
         QMenubarUpdatedEvent menubarUpdated(q);
         QApplication::sendEvent(q->parentWidget(), &menubarUpdated);
+        QApplication::sendEvent(parent, &menubarUpdated);
+    }
 #endif
 …
+{
     Q_Q(const QMenuBar);
+    QRect ret = actionRects.value(act);
+    const int fw = q->style()->pixelMetric(QStyle::PM_MenuBarPanelWidth, 0, q);
+    ret.translate(fw, fw);
+    const int index = actions.indexOf(act);
+    if (index == -1)
+        return QRect();
+    //makes sure the geometries are up-to-date
+    const_cast<QMenuBarPrivate*>(this)->updateGeometries();
+    if (index >= actionRects.count())
+        return QRect(); // that can happen in case of native menubar
+    QRect ret = actionRects.at(index);
     return QStyle::visualRect(q->layoutDirection(), q->rect(), ret);
+}
+void QMenuBarPrivate::focusFirstAction()
+{
+    if(!currentAction) {
+        updateGeometries();
+        int index = 0;
+        while (index < actions.count() && actionRects.at(index).isNull()) ++index;
+        if (index < actions.count())
+            setCurrentAction(actions.at(index));
+    }
+}
 …
     keyboardState = b;
     if(b) {
         QWidget *fw = qApp->focusWidget();
+        QWidget *fw = QApplication::focusWidget();
         if (fw != q)
             keyboardFocusWidget = fw;
+        if(!currentAction && !actionList.isEmpty())
+            setCurrentAction(actionList.first());
+        focusFirstAction();
         q->setFocus(Qt::MenuBarFocusReason);
     } else {
 …
             setCurrentAction(0);
         if(keyboardFocusWidget) {
             if (qApp->focusWidget() == q)
+            if (QApplication::focusWidget() == q)
                 keyboardFocusWidget->setFocus(Qt::MenuBarFocusReason);
             keyboardFocusWidget = 0;
 …
         QSize popup_size = activeMenu->sizeHint();
+        QRect screenRect = QApplication::desktop()->screenGeometry(pos);
+        //we put the popup menu on the screen containing the bottom-center of the action rect
+        QRect screenRect = QApplication::desktop()->screenGeometry(pos + QPoint(adjustedActionRect.width() / 2, 0));
+        pos = QPoint(qMax(pos.x(), screenRect.x()), qMax(pos.y(), screenRect.y()));
         const bool fitUp = (q->mapToGlobal(adjustedActionRect.topLeft()).y() >= popup_size.height());
         const bool fitDown = (pos.y() + popup_size.height() <= screenRect.bottom());
+        const bool rtl = q->isRightToLeft();
         const int actionWidth = adjustedActionRect.width();
         if (!fitUp && !fitDown) { //we should shift the menu
             bool shouldShiftToRight = !q->isRightToLeft();
             if (q->isRightToLeft() && popup_size.width() > pos.x())
+            bool shouldShiftToRight = !rtl;
+            if (rtl && popup_size.width() > pos.x())
                 shouldShiftToRight = true;
             else if (actionWidth + popup_size.width() + pos.x() > screenRect.right())
                 shouldShiftToRight = false;
+            if (shouldShiftToRight)
+                pos.rx() += actionWidth;
+            else
+                pos.rx() -= popup_size.width();
+        } else if (q->isRightToLeft()) {
+            pos.setX(pos.x()-(popup_size.width() - actionWidth));
+        }
+        if(pos.x() < screenRect.x()) {
+            pos.setX(screenRect.x());
+        } else {
+            const int off = pos.x()+popup_size.width() - screenRect.right();
+            if(off > 0)
+                pos.setX(qMax(screenRect.x(), pos.x()-off));
+            if (shouldShiftToRight) {
+                pos.rx() += actionWidth + (rtl ? popup_size.width() : 0);
+            } else {
+                //shift to left
+                if (!rtl)
+                    pos.rx() -= popup_size.width();
+            }
+        } else if (rtl) {
+            pos.rx() += actionWidth;
+        }
 …
+}
 void QMenuBarPrivate::calcActionRects(int max_width, int start, QMap<QAction*, QRect> &actionRects, QList<QAction*> &actionList) const
+void QMenuBarPrivate::calcActionRects(int max_width, int start) const
+{
     Q_Q(const QMenuBar);
+    if(!itemsDirty && itemsWidth == max_width && itemsStart == start) {
+        actionRects = actionRects;
+        actionList = actionList;
+    if(!itemsDirty)
         return;
+    }
+    actionRects.clear();
+    actionList.clear();
+    const int itemSpacing = q->style()->pixelMetric(QStyle::PM_MenuBarItemSpacing, 0, q);
+    //let's reinitialize the buffer
+    actionRects.resize(actions.count());
+    actionRects.fill(QRect());
+    const QStyle *style = q->style();
+    const int itemSpacing = style->pixelMetric(QStyle::PM_MenuBarItemSpacing, 0, q);
     int max_item_height = 0, separator = -1, separator_start = 0, separator_len = 0;
-    QList<QAction*> items = q->actions();
     //calculate size
     const QFontMetrics fm = q->fontMetrics();
     const int hmargin = q->style()->pixelMetric(QStyle::PM_MenuBarHMargin, 0, q),
               vmargin = q->style()->pixelMetric(QStyle::PM_MenuBarVMargin, 0, q),
                 icone = q->style()->pixelMetric(QStyle::PM_SmallIconSize, 0, q);
     for(int i = 0; i < items.count(); i++) {
         QAction *action = items.at(i);
+    const int hmargin = style->pixelMetric(QStyle::PM_MenuBarHMargin, 0, q),
+              vmargin = style->pixelMetric(QStyle::PM_MenuBarVMargin, 0, q),
+                icone = style->pixelMetric(QStyle::PM_SmallIconSize, 0, q);
+    for(int i = 0; i < actions.count(); i++) {
+        QAction *action = actions.at(i);
         if(!action->isVisible())
             continue;
 …
         //calc what I think the size is..
         if(action->isSeparator()) {
             if (q->style()->styleHint(QStyle::SH_DrawMenuBarSeparator, 0, q))
                 separator = actionRects.count();
+            if (style->styleHint(QStyle::SH_DrawMenuBarSeparator, 0, q))
+                separator = i;
             continue; //we don't really position these!
         } else {
+            QString s = action->text();
+            if(!s.isEmpty()) {
+                int w = fm.width(s);
+                w -= s.count(QLatin1Char('&')) * fm.width(QLatin1Char('&'));
+                w += s.count(QLatin1String("&&")) * fm.width(QLatin1Char('&'));
+                sz = QSize(w, fm.height());
+            }
+            const QString s = action->text();
             QIcon is = action->icon();
+            if (!is.isNull()) {
+                QSize is_sz = QSize(icone, icone);
+                if (is_sz.height() > sz.height())
+                    sz.setHeight(is_sz.height());
+                if (is_sz.width() > sz.width())
+                    sz.setWidth(is_sz.width());
+            }
+            // If an icon is set, only the icon is visible
+            if (!is.isNull())
+                sz = sz.expandedTo(QSize(icone, icone));
+            else if (!s.isEmpty())
+                sz = fm.size(Qt::TextShowMnemonic, s);
+        }
 …
         if(!sz.isEmpty()) {
             { //update the separator state
+                int iWidth = sz.width();
+                iWidth += itemSpacing;
+                int iWidth = sz.width() + itemSpacing;
                 if(separator == -1)
                     separator_start += iWidth;
 …
             max_item_height = qMax(max_item_height, sz.height());
             //append
+            actionRects.insert(action, QRect(0, 0, sz.width(), sz.height()));
+            actionList.append(action);
+            actionRects[i] = QRect(0, 0, sz.width(), sz.height());
+        }
+    }
     //calculate position
+    int x = ((start == -1) ? hmargin : start) + itemSpacing;
+    int y = vmargin;
+    for(int i = 0; i < actionList.count(); i++) {
+        QAction *action = actionList.at(i);
+        QRect &rect = actionRects[action];
+    const int fw = q->style()->pixelMetric(QStyle::PM_MenuBarPanelWidth, 0, q);
+    int x = fw + ((start == -1) ? hmargin : start) + itemSpacing;
+    int y = fw + vmargin;
+    for(int i = 0; i < actions.count(); i++) {
+        QRect &rect = actionRects[i];
+        if (rect.isNull())
+            continue;
         //resize
         rect.setHeight(max_item_height);
 …
 #ifndef QT_NO_ACCESSIBILITY
         if (QAccessible::isActive()) {
-            QList<QAction*> actions = q->actions();
             int actionIndex = actions.indexOf(action);
             ++actionIndex;
 …
     \brief The QMenuBar class provides a horizontal menu bar.
+    \ingroup application
+    \mainclass
+    \ingroup mainwindow-classes
     A menu bar consists of a list of pull-down menu items. You add
 …
     \row \i about.*
          \i Application Menu | About <application name>
+         \i If this entry is not found no About item will appear in
+            the Application Menu
+         \i The application name is fetched from the \c {Info.plist} file
+            (see note below). If this entry is not found no About item
+            will appear in the Application Menu.
     \row \i config, options, setup, settings or preferences
          \i Application Menu | Preferences
 …
     The \l{mainwindows/menus}{Menus} example shows how to use QMenuBar
     and QMenu.  The other \l{Qt Examples#Main Windows}{main window
+    and QMenu.  The other \l{Main Window Examples}{main window
     application examples} also provide menus using these classes.
     \sa QMenu, QShortcut, QAction,
         {http://developer.apple.com/documentation/UserExperience/Conceptual/OSXHIGuidelines/index.html}{Introduction to Apple Human Interface Guidelines},
+        {http://developer.apple.com/documentation/UserExperience/Conceptual/AppleHIGuidelines/XHIGIntro/XHIGIntro.html}{Introduction to Apple Human Interface Guidelines},
         {fowler}{GUI Design Handbook: Menu Bar}, {Menus Example}
 */
 …
         q->hide();
 #endif
 #ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
     if (qt_wince_is_mobile()) {
         wceCreateMenuBar(q->parentWidget());
 …
             q->hide();
+    }
+#endif
+    else {
+        QApplication::setAttribute(Qt::AA_DontUseNativeMenuBar, true);
+    }
+#endif
+#ifdef Q_WS_S60
+    symbianCreateMenuBar(q->parentWidget());
+    if(symbian_menubar)
+        q->hide();
+#endif
     q->setBackgroundRole(QPalette::Button);
     oldWindow = oldParent = 0;
 …
+}
+//Gets the next action for keyboard navigation
+QAction *QMenuBarPrivate::getNextAction(const int _start, const int increment) const
+{
+    Q_Q(const QMenuBar);
+    const_cast<QMenuBarPrivate*>(this)->updateGeometries();
+    bool allowActiveAndDisabled = q->style()->styleHint(QStyle::SH_Menu_AllowActiveAndDisabled, 0, q);
+    const int start = (_start == -1 && increment == -1) ? actions.count() : _start;
+    const int end =  increment == -1 ? 0 : actions.count() - 1;
+    for (int i = start; start != end;) {
+        i += increment;
+        QAction *current = actions.at(i);
+        if (!actionRects.at(i).isNull() && (allowActiveAndDisabled || current->isEnabled()))
+            return current;
+    }
+    if (_start != -1) //let's try from the beginning or the end
+        return getNextAction(-1, increment);
+    return 0;
+}
 /*!
     Constructs a menu bar with parent \a parent.
 …
     d->macDestroyMenuBar();
 #endif
 #ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
     Q_D(QMenuBar);
     if (qt_wince_is_mobile())
         d->wceDestroyMenuBar();
+#endif
+#ifdef Q_WS_S60
+    Q_D(QMenuBar);
+    d->symbianDestroyMenuBar();
 #endif
+}
 …
     Removes all the actions from the menu bar.
+    \note On Mac OS X, menu items that have been merged to the system
+    menu bar are not removed by this function. One way to handle this
+    would be to remove the extra actions yourself. You can set the
+    \l{QAction::MenuRole}{menu role} on the different menus, so that
+    you know ahead of time which menu items get merged and which do
+    not. Then decide what to recreate or remove yourself.
     \sa removeAction()
 */
 …
     //draw the items
     for (int i = 0; i < d->actionList.count(); ++i) {
         QAction *action = d->actionList.at(i);
+    for (int i = 0; i < d->actions.count(); ++i) {
+        QAction *action = d->actions.at(i);
         QRect adjustedActionRect = d->actionRect(action);
         if (adjustedActionRect.isEmpty() || !d->isVisible(action))
 …
 void QMenuBar::setVisible(bool visible)
+{
+#ifdef Q_WS_MAC
+    Q_D(QMenuBar);
+    if(d->mac_menubar)
+        return;
+#endif
+#ifdef Q_OS_WINCE
+    Q_D(QMenuBar);
+    if(d->wce_menubar)
+#if defined(Q_WS_MAC) || defined(Q_OS_WINCE) || defined(Q_WS_S60)
+    if (isNativeMenuBar())
         return;
 #endif
 …
     if(e->button() != Qt::LeftButton)
         return;
+    d->mouseDown = true;
     QAction *action = d->actionAt(e->pos());
 …
         return;
+    }
-    d->mouseDown = true;
     if(d->currentAction == action && d->popupState) {
 …
+{
     Q_D(QMenuBar);
+    d->updateGeometries();
     int key = e->key();
     if(isRightToLeft()) {  // in reverse mode open/close key for submenues are reversed
 …
     case Qt::Key_Left: {
         if(d->currentAction) {
+            QAction *nextAction = 0;
+            bool allowActiveAndDisabled =
+                    style()->styleHint(QStyle::SH_Menu_AllowActiveAndDisabled, 0, this);
+            for(int i=0; i<(int)d->actionList.count(); i++) {
+                if(d->actionList.at(i) == (QAction*)d->currentAction) {
+                    if (key == Qt::Key_Left) {
+                        while (i > 0) {
+                            i--;
+                            if (allowActiveAndDisabled || d->actionList[i]->isEnabled()) {
+                                nextAction = d->actionList.at(i);
+                                break;
+                            }
+                        }
+                    } else {
+                        while (i < d->actionList.count()-1) {
+                            i++;
+                            if (allowActiveAndDisabled || d->actionList[i]->isEnabled()) {
+                                nextAction = d->actionList.at(i);
+                                break;
+                            }
+                        }
+                    }
+                    break;
+                }
+            }
+            if(!nextAction) {
+                if (key == Qt::Key_Left) {
+                    for (int i = d->actionList.size() - 1 ; i >= 0 ; --i) {
+                        if (allowActiveAndDisabled || d->actionList[i]->isEnabled()) {
+                            nextAction = d->actionList.at(i);
+                            i--;
+                            break;
+                        }
+                    }
+                } else {
+                    for (int i = 0 ; i < d->actionList.count() ; ++i) {
+                        if (allowActiveAndDisabled || d->actionList[i]->isEnabled()) {
+                            nextAction = d->actionList.at(i);
+                            i++;
+                            break;
+                        }
+                    }
+                }
+            }
+            if(nextAction) {
+            int index = d->actions.indexOf(d->currentAction);
+            if (QAction *nextAction = d->getNextAction(index, key == Qt::Key_Left ? -1 : +1)) {
                 d->setCurrentAction(nextAction, d->popupState, true);
                 key_consumed = true;
 …
+        {
             QChar c = e->text()[0].toUpper();
+            for(int i = 0; i < d->actionList.size(); ++i) {
+                register QAction *act = d->actionList.at(i);
+            for(int i = 0; i < d->actions.size(); ++i) {
+                if (d->actionRects.at(i).isNull())
+                    continue;
+                QAction *act = d->actions.at(i);
                 QString s = act->text();
                 if(!s.isEmpty()) {
 …
+{
     Q_D(QMenuBar);
+    d->mouseDown = e->buttons() & Qt::LeftButton;
+    if (!(e->buttons() & Qt::LeftButton))
+        d->mouseDown = false;
+    bool popupState = d->popupState || d->mouseDown;
     QAction *action = d->actionAt(e->pos());
-    bool popupState = d->popupState || d->mouseDown;
     if ((action && d->isVisible(action)) || !popupState)
         d->setCurrentAction(action, popupState);
 …
+{
     Q_D(QMenuBar);
+    if(!hasFocus() && !d->popupState)
+    if((!hasFocus() && !d->popupState) ||
+        (d->currentAction && d->currentAction->menu() == 0))
         d->setCurrentAction(0);
+}
 …
     Q_D(QMenuBar);
     d->itemsDirty = true;
+#if defined (Q_WS_MAC) || defined(Q_OS_WINCE) || defined(Q_WS_S60)
+    if (isNativeMenuBar()) {
 #ifdef Q_WS_MAC
+    if(d->mac_menubar) {
+        QMenuBarPrivate::QMacMenuBarPrivate *nativeMenuBar = d->mac_menubar;
+#elif defined(Q_WS_S60)
+        QMenuBarPrivate::QSymbianMenuBarPrivate *nativeMenuBar = d->symbian_menubar;
+#else
+        QMenuBarPrivate::QWceMenuBarPrivate *nativeMenuBar = d->wce_menubar;
+#endif
+        if (!nativeMenuBar)
+            return;
         if(e->type() == QEvent::ActionAdded)
             d->mac_menubar->addAction(e->action(), d->mac_menubar->findAction(e->before()));
+            nativeMenuBar->addAction(e->action(), nativeMenuBar->findAction(e->before()));
         else if(e->type() == QEvent::ActionRemoved)
             d->mac_menubar->removeAction(e->action());
+            nativeMenuBar->removeAction(e->action());
         else if(e->type() == QEvent::ActionChanged)
+            d->mac_menubar->syncAction(e->action());
+    }
+#endif
+#ifdef Q_OS_WINCE
+    if(d->wce_menubar) {
+        if(e->type() == QEvent::ActionAdded)
+            d->wce_menubar->addAction(e->action(), d->wce_menubar->findAction(e->before()));
+        else if(e->type() == QEvent::ActionRemoved)
+            d->wce_menubar->removeAction(e->action());
+        else if(e->type() == QEvent::ActionChanged)
+            d->wce_menubar->syncAction(e->action());
+    }
+#endif
+            nativeMenuBar->syncAction(e->action());
+    }
+#endif
     if(e->type() == QEvent::ActionAdded) {
         connect(e->action(), SIGNAL(triggered()), this, SLOT(_q_actionTriggered()));
 …
+{
     Q_D(QMenuBar);
     if(d->keyboardState && !d->currentAction && !d->actionList.isEmpty())
         d->setCurrentAction(d->actionList.first());
+    if(d->keyboardState)
+        d->focusFirstAction();
+}
 …
 #ifdef Q_WS_MAC
+    macDestroyMenuBar();
+    macCreateMenuBar(newParent);
+#endif
+#ifdef Q_OS_WINCE
+    if (q->isNativeMenuBar() && !macWidgetHasNativeMenubar(newParent)) {
+        // If the new parent got a native menubar from before, keep that
+        // menubar rather than replace it with this one (because a parents
+        // menubar has precedence over children menubars).
+        macDestroyMenuBar();
+        macCreateMenuBar(newParent);
+    }
+#endif
+#ifdef Q_WS_WINCE
     if (qt_wince_is_mobile() && wce_menubar)
         wce_menubar->rebuild();
 #endif
+#ifdef Q_WS_S60
+    if (symbian_menubar)
+        symbian_menubar->rebuild();
+#endif
+}
 …
     case QEvent::ShortcutOverride: {
         QKeyEvent *kev = static_cast<QKeyEvent*>(e);
+        if (kev->key() == Qt::Key_Escape) {
+        //we only filter out escape if there is a current action
+        if (kev->key() == Qt::Key_Escape && d->currentAction) {
             e->accept();
             return true;
 …
+{
     Q_D(const QMenuBar);
+#ifdef Q_WS_MAC
+    const bool as_gui_menubar = !d->mac_menubar;
+#elif defined (Q_OS_WINCE)
+    const bool as_gui_menubar = !d->wce_menubar;
+#if defined(Q_WS_MAC) || defined(Q_WS_WINCE) || defined(Q_WS_S60)
+    const bool as_gui_menubar = !isNativeMenuBar();
 #else
     const bool as_gui_menubar = true;
 …
     ensurePolished();
     QSize ret(0, 0);
+    const_cast<QMenuBarPrivate*>(d)->updateGeometries();
     const int hmargin = style()->pixelMetric(QStyle::PM_MenuBarHMargin, 0, this);
     const int vmargin = style()->pixelMetric(QStyle::PM_MenuBarVMargin, 0, this);
 …
     int spaceBelowMenuBar = style()->styleHint(QStyle::SH_MainWindow_SpaceBelowMenuBar, 0, this);
     if(as_gui_menubar) {
-        QMap<QAction*, QRect> actionRects;
-        QList<QAction*> actionList;
         int w = parentWidget() ? parentWidget()->width() : QApplication::desktop()->width();
+        d->calcActionRects(w - (2 * fw), 0, actionRects, actionList);
+        if (d->actionList.count() > 0) {
+            ret = d->actionRect(d->actionList.at(0)).size();
+            if (!d->extension->isHidden())
+                ret += QSize(d->extension->sizeHint().width(), 0);
+        }
+        d->calcActionRects(w - (2 * fw), 0);
+        for (int i = 0; ret.isNull() && i < d->actions.count(); ++i)
+            ret = d->actionRects.at(i).size();
+        if (!d->extension->isHidden())
+            ret += QSize(d->extension->sizeHint().width(), 0);
         ret += QSize(2*fw + hmargin, 2*fw + vmargin);
+    }
 …
+{
     Q_D(const QMenuBar);
+#ifdef Q_WS_MAC
+    const bool as_gui_menubar = !d->mac_menubar;
+#elif defined (Q_OS_WINCE)
+    const bool as_gui_menubar = !d->wce_menubar;
+#if defined(Q_WS_MAC) || defined(Q_WS_WINCE) || defined(Q_WS_S60)
+    const bool as_gui_menubar = !isNativeMenuBar();
 #else
     const bool as_gui_menubar = true;
 #endif
     ensurePolished();
     QSize ret(0, 0);
+    const_cast<QMenuBarPrivate*>(d)->updateGeometries();
     const int hmargin = style()->pixelMetric(QStyle::PM_MenuBarHMargin, 0, this);
     const int vmargin = style()->pixelMetric(QStyle::PM_MenuBarVMargin, 0, this);
 …
     int spaceBelowMenuBar = style()->styleHint(QStyle::SH_MainWindow_SpaceBelowMenuBar, 0, this);
     if(as_gui_menubar) {
-        QMap<QAction*, QRect> actionRects;
-        QList<QAction*> actionList;
         const int w = parentWidget() ? parentWidget()->width() : QApplication::desktop()->width();
+        d->calcActionRects(w - (2 * fw), 0, actionRects, actionList);
+        for (QMap<QAction*, QRect>::const_iterator i = actionRects.constBegin();
+             i != actionRects.constEnd(); ++i) {
+            QRect actionRect(i.value());
+            if(actionRect.x() + actionRect.width() > ret.width())
+                ret.setWidth(actionRect.x() + actionRect.width());
+            if(actionRect.y() + actionRect.height() > ret.height())
+                ret.setHeight(actionRect.y() + actionRect.height());
+        }
+        ret += QSize(2*fw + 2*hmargin, 2*fw + 2*vmargin);
+        d->calcActionRects(w - (2 * fw), 0);
+        for (int i = 0; i < d->actionRects.count(); ++i) {
+            const QRect &actionRect = d->actionRects.at(i);
+            ret = ret.expandedTo(QSize(actionRect.x() + actionRect.width(), actionRect.y() + actionRect.height()));
+        }
+        //the action geometries already contain the top and left
+        //margins. So we only need to add those from right and bottom.
+        ret += QSize(fw + hmargin, fw + vmargin);
+    }
     int margin = 2*vmargin + 2*fw + spaceBelowMenuBar;
 …
+{
     Q_D(const QMenuBar);
+#ifdef Q_WS_MAC
+    const bool as_gui_menubar = !d->mac_menubar;
+#elif defined (Q_OS_WINCE)
+    const bool as_gui_menubar = !d->wce_menubar;
+#if defined(Q_WS_MAC) || defined(Q_WS_WINCE) || defined(Q_WS_S60)
+    const bool as_gui_menubar = !isNativeMenuBar();
 #else
     const bool as_gui_menubar = true;
 #endif
+    const_cast<QMenuBarPrivate*>(d)->updateGeometries();
     int height = 0;
     const int vmargin = style()->pixelMetric(QStyle::PM_MenuBarVMargin, 0, this);
 …
     int spaceBelowMenuBar = style()->styleHint(QStyle::SH_MainWindow_SpaceBelowMenuBar, 0, this);
     if(as_gui_menubar) {
         if (d->actionList.count()) {
             // assume all actionrects have the same height
             height = d->actionRect(d->actionList.first()).height();
+        for (int i = 0; i < d->actionRects.count(); ++i)
+            height = qMax(height, d->actionRects.at(i).height());
+        if (height) //there is at least one non-null item
             height += spaceBelowMenuBar;
+        }
         height += 2*fw;
         height += 2*vmargin;
 …
+{
     Q_Q(QMenuBar);
     QAction *act = actionList.at(id);
+    QAction *act = actions.at(id);
     setCurrentAction(act, true, true);
     if (act && !act->menu()) {
 …
         //100 is the same as the default value in QPushButton::animateClick
         autoReleaseTimer.start(100, q);
+    } else if (act && q->style()->styleHint(QStyle::SH_MenuBar_AltKeyNavigation, 0, q)) {
+        // When we open a menu using a shortcut, we should end up in keyboard state
+        setKeyboardMode(true);
+    }
+}
 …
 /*!
+    \property QMenuBar::nativeMenuBar
+    \brief Whether or not a menubar will be used as a native menubar on platforms that support it
+    \since 4.6
+    This property specifies whether or not the menubar should be used as a native menubar on platforms
+    that support it. The currently supported platforms are Mac OS X and Windows CE. On these platforms
+    if this property is true, the menubar is used in the native menubar and is not in the window of
+    its parent, if false the menubar remains in the window. On other platforms the value of this
+    attribute has no effect.
+    The default is to follow whether the Qt::AA_DontUseNativeMenuBar attribute
+    is set for the application. Explicitly settings this property overrides
+    the presence (or abscence) of the attribute.
+*/
+void QMenuBar::setNativeMenuBar(bool nativeMenuBar)
+{
+    Q_D(QMenuBar);
+    if (d->nativeMenuBar == -1 || (nativeMenuBar != bool(d->nativeMenuBar))) {
+        d->nativeMenuBar = nativeMenuBar;
+#ifdef Q_WS_MAC
+        if (!d->nativeMenuBar) {
+            extern void qt_mac_clear_menubar();
+            qt_mac_clear_menubar();
+            d->macDestroyMenuBar();
+            const QList<QAction *> &menubarActions = actions();
+            for (int i = 0; i < menubarActions.size(); ++i) {
+                const QAction *action = menubarActions.at(i);
+                if (QMenu *menu = action->menu()) {
+                    delete menu->d_func()->mac_menu;
+                    menu->d_func()->mac_menu = 0;
+                }
+            }
+        } else {
+            d->macCreateMenuBar(parentWidget());
+        }
+        macUpdateMenuBar();
+        updateGeometry();
+        setVisible(false);
+        setVisible(true);
+#endif
+    }
+}
+bool QMenuBar::isNativeMenuBar() const
+{
+    Q_D(const QMenuBar);
+    if (d->nativeMenuBar == -1) {
+        return !QApplication::instance()->testAttribute(Qt::AA_DontUseNativeMenuBar);
+    }
+    return d->nativeMenuBar;
+}
+/*!
   \since 4.4
 …
 */
 #ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
 void QMenuBar::setDefaultAction(QAction *act)
+{
 …
     if (d->defaultAction == act)
         return;
 #ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
     if (qt_wince_is_mobile())
         if (d->defaultAction) {
             disconnect(d->defaultAction, SIGNAL(changed()), this, SLOT(_q_updateDefaultAction()));
             disconnect(d->defaultAction, SIGNAL(destroyed ()), this, SLOT(_q_updateDefaultAction()));
+            disconnect(d->defaultAction, SIGNAL(destroyed()), this, SLOT(_q_updateDefaultAction()));
+        }
 #endif
     d->defaultAction = act;
 #ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
     if (qt_wince_is_mobile())
         if (d->defaultAction) {
 …
 /*!
     \fn int QMenuBar::margin() const
     Returns the with of the the margin around the contents of the widget.
+    Returns the width of the margin around the contents of the widget.
     Use QWidget::getContentsMargins() instead.

trunk/src/gui/widgets/qmenubar.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     Q_PROPERTY(bool defaultUp READ isDefaultUp WRITE setDefaultUp)
+    Q_PROPERTY(bool nativeMenuBar READ isNativeMenuBar WRITE setNativeMenuBar)
 public:
 …
 #endif
 #ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
     void setDefaultAction(QAction *);
     QAction *defaultAction() const;
 …
     static void wceRefresh();
 #endif
+    bool isNativeMenuBar() const;
+    void setNativeMenuBar(bool nativeMenuBar);
 public Q_SLOTS:
 …
     Q_PRIVATE_SLOT(d_func(), void _q_updateLayout())
 #ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
     Q_PRIVATE_SLOT(d_func(), void _q_updateDefaultAction())
 #endif

trunk/src/gui/widgets/qmenubar_p.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #include <private/qmenu_p.h> // Mac needs what in this file!
 #ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
 #include "qguifunctions_wince.h"
+#endif
+#ifndef QT_NO_MENUBAR
+#ifdef Q_WS_S60
+class CCoeControl;
+class CEikMenuBar;
+#endif
 #endif
 …
     Q_DECLARE_PUBLIC(QMenuBar)
 public:
+    QMenuBarPrivate() : itemsDirty(0), itemsWidth(0), itemsStart(-1), currentAction(0), mouseDown(0),
+                         closePopupMode(0), defaultPopDown(1), popupState(0), keyboardState(0), altPressed(0)
+    QMenuBarPrivate() : itemsDirty(0), currentAction(0), mouseDown(0),
+                         closePopupMode(0), defaultPopDown(1), popupState(0), keyboardState(0), altPressed(0),
+                         nativeMenuBar(-1), doChildEffects(false)
+#ifdef QT3_SUPPORT
+                         , doAutoResize(false)
+#endif
 #ifdef Q_WS_MAC
                          , mac_menubar(0)
 #endif
 #ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
                          , wce_menubar(0), wceClassicMenu(false)
 #endif
+    { }
+#ifdef Q_WS_S60
+                         , symbian_menubar(0)
+#endif
+        { }
     ~QMenuBarPrivate()
+        {
 …
             delete mac_menubar;
 #endif
 #ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
             delete wce_menubar;
 #endif
+#ifdef Q_WS_S60
+            delete symbian_menubar;
+#endif
+        }
     void init();
     QStyleOptionMenuItem getStyleOption(const QAction *action) const;
+    QAction *getNextAction(const int start, const int increment) const;
     //item calculations
     uint itemsDirty : 1;
-    int itemsWidth, itemsStart;
     QVector<int> shortcutIndexMap;
+    mutable QMap<QAction*, QRect> actionRects;
+    mutable QList<QAction*> actionList;
+    void calcActionRects(int max_width, int start, QMap<QAction*, QRect> &actionRects, QList<QAction*> &actionList) const;
+    mutable QVector<QRect> actionRects;
+    void calcActionRects(int max_width, int start) const;
     QRect actionRect(QAction *) const;
     void updateGeometries();
 …
     //keyboard mode for keyboard navigation
+    void focusFirstAction();
     void setKeyboardMode(bool);
     uint keyboardState : 1, altPressed : 1;
     QPointer<QWidget> keyboardFocusWidget;
+    int nativeMenuBar : 3;  // Only has values -1, 0, and 1
     //firing of events
     void activateAction(QAction *, QAction::ActionEvent);
 …
     void _q_updateLayout();
 #ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
     void _q_updateDefaultAction();
 #endif
 …
+        }
     } *mac_menubar;
+    bool macWidgetHasNativeMenubar(QWidget *widget);
     void macCreateMenuBar(QWidget *);
     void macDestroyMenuBar();
     OSMenuRef macMenu();
 #endif
 #ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
     void wceCreateMenuBar(QWidget *);
     void wceDestroyMenuBar();
 …
     bool wceEmitSignals(QList<QWceMenuAction*> actions, uint command);
 #endif
+#ifdef Q_WS_S60
+    void symbianCreateMenuBar(QWidget *);
+    void symbianDestroyMenuBar();
+    struct QSymbianMenuBarPrivate {
+        QList<QSymbianMenuAction*> actionItems;
+        QMenuBarPrivate *d;
+        QSymbianMenuBarPrivate(QMenuBarPrivate *menubar);
+        ~QSymbianMenuBarPrivate();
+        void addAction(QAction *, QSymbianMenuAction* =0);
+        void addAction(QSymbianMenuAction *, QSymbianMenuAction* =0);
+        void syncAction(QSymbianMenuAction *);
+        inline void syncAction(QAction *a) { syncAction(findAction(a)); }
+        void removeAction(QSymbianMenuAction *);
+        void rebuild();
+        inline void removeAction(QAction *a) { removeAction(findAction(a)); }
+        inline QSymbianMenuAction *findAction(QAction *a) {
+            for(int i = 0; i < actionItems.size(); i++) {
+                QSymbianMenuAction *act = actionItems[i];
+                if(a == act->action)
+                    return act;
+            }
+            return 0;
+        }
+        void insertNativeMenuItems(const QList<QAction*> &actions);
+    } *symbian_menubar;
+    static int symbianCommands(int command);
+#endif
 };
 #endif

trunk/src/gui/widgets/qmenudata.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/qmenudata.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     void setId(int);
     void setSignalValue(int);
+    Q_DISABLE_COPY(QMenuItem)
 };

trunk/src/gui/widgets/qplaintextedit.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #include <qtexttable.h>
 #include <qvariant.h>
 #include <qinputcontext.h>
 …
 QT_BEGIN_NAMESPACE
+static inline bool shouldEnableInputMethod(QPlainTextEdit *plaintextedit)
+{
+    return !plaintextedit->isReadOnly();
+}
 class QPlainTextDocumentLayoutPrivate : public QAbstractTextDocumentLayoutPrivate
 …
     \brief The QPlainTextDocumentLayout class implements a plain text layout for QTextDocument
+    \ingroup text
+    \ingroup richtext-processing
    A QPlainTextDocumentLayout is required for text documents that can
 …
 void QPlainTextDocumentLayout::requestUpdate()
+{
     emit update(QRectF(0., -4., 1000000000., 1000000000.));
+    emit update(QRectF(0., -document()->documentMargin(), 1000000000., 1000000000.));
+}
 …
     if (!d->blockUpdate)
+        emit update(); // optimization potential
+        emit update(QRectF(0., -doc->documentMargin(), 1000000000., 1000000000.)); // optimization potential
+}
 …
     QTextDocument *doc = document();
     qreal margin = doc->documentMargin();
-    QFontMetrics fm(doc->defaultFont());
     qreal blockMaximumWidth = 0;
-    int leading = qMax(0, fm.leading());
     qreal height = 0;
     QTextLayout *tl = block.layout();
 …
+    }
     tl->beginLayout();
+    qreal availableWidth = d->width;
+    if (availableWidth <= 0) {
+        availableWidth = qreal(INT_MAX); // similar to text edit with pageSize.width == 0
+    }
+    availableWidth -= 2*margin + extraMargin;
     while (1) {
         QTextLine line = tl->createLine();
         if (!line.isValid())
             break;
+        line.setLineWidth(d->width - 2*margin - extraMargin);
+        height += leading;
+        line.setLeadingIncluded(true);
+        line.setLineWidth(availableWidth);
         line.setPosition(QPointF(margin, height));
         height += line.height();
 …
+{
     pageUpDownLastCursorYIsValid = false;
 };
+}
 void QPlainTextEditPrivate::_q_verticalScrollbarActionTriggered(int action) {
 …
     int currentBlockNumber = topBlock;
     QTextBlock currentBlock = document()->findBlockByNumber(currentBlockNumber);
+    if (!currentBlock.isValid())
+        return -1;
     QPlainTextDocumentLayout *documentLayout = qobject_cast<QPlainTextDocumentLayout*>(document()->documentLayout());
     Q_ASSERT(documentLayout);
 …
         return QRectF();
     Q_ASSERT(currentBlock.blockNumber() == currentBlockNumber);
+    QPlainTextDocumentLayout *documentLayout = qobject_cast<QPlainTextDocumentLayout*>(document()->documentLayout());
+    QTextDocument *doc = document();
+    QPlainTextDocumentLayout *documentLayout = qobject_cast<QPlainTextDocumentLayout*>(doc->documentLayout());
     Q_ASSERT(documentLayout);
 …
         return QRectF();
     QRectF r = documentLayout->blockBoundingRect(currentBlock);
+    while (currentBlockNumber < blockNumber && offset.y() <= 2* textEdit->viewport()->height()) {
+    int maxVerticalOffset = r.height();
+    while (currentBlockNumber < blockNumber && offset.y() - maxVerticalOffset <= 2* textEdit->viewport()->height()) {
         offset.ry() += r.height();
         currentBlock = currentBlock.next();
         ++currentBlockNumber;
+        if (!currentBlock.isVisible()) {
+            currentBlock = doc->findBlockByLineNumber(currentBlock.firstLineNumber());
+            currentBlockNumber = currentBlock.blockNumber();
+        }
         r = documentLayout->blockBoundingRect(currentBlock);
+    }
     while (currentBlockNumber > blockNumber && offset.y() >= -textEdit->viewport()->height()) {
+    while (currentBlockNumber > blockNumber && offset.y() + maxVerticalOffset >= -textEdit->viewport()->height()) {
         currentBlock = currentBlock.previous();
+        --currentBlockNumber;
+        while (!currentBlock.isVisible()) {
+            currentBlock = currentBlock.previous();
+            --currentBlockNumber;
+        }
         if (!currentBlock.isValid())
             break;
+        --currentBlockNumber;
         r = documentLayout->blockBoundingRect(currentBlock);
         offset.ry() -= r.height();
 …
     if (viewport->updatesEnabled() && viewport->isVisible()) {
         int dy = 0;
         if (doc->findBlockByLineNumber(control->topBlock).isValid()) {
+        if (doc->findBlockByNumber(control->topBlock).isValid()) {
             dy = (int)(-q->blockBoundingGeometry(block).y())
                  + verticalOffset() - verticalOffset(blockNumber, lineNumber);
 …
         qreal h = center ? line.naturalTextRect().center().y() : line.naturalTextRect().bottom();
+        QTextBlock previousVisibleBlock = block;
         while (h < height && block.previous().isValid()) {
+            block = block.previous();
+            previousVisibleBlock = block;
+            do {
+                block = block.previous();
+            } while (!block.isVisible() && block.previous().isValid());
             h += q->blockBoundingRect(block).height();
+        }
 …
+        }
         if (block.next().isValid() && l >= lineCount) {
             block = block.next();
+        if (l >= lineCount) {
+            block = previousVisibleBlock;
             l = 0;
+        }
 …
       lineWrap(QPlainTextEdit::WidgetWidth),
       wordWrap(QTextOption::WrapAtWordBoundaryOrAnywhere),
+      topLine(0), pageUpDownLastCursorYIsValid(false)
+      clickCausedFocus(0),topLine(0),
+      pageUpDownLastCursorYIsValid(false)
+{
     showCursorOnInitialShow = true;
 …
     QObject::connect(control, SIGNAL(cursorPositionChanged()), q, SIGNAL(cursorPositionChanged()));
+    QObject::connect(control, SIGNAL(textChanged()), q, SLOT(updateMicroFocus()));
     // set a null page size initially to avoid any relayouting until the textedit
     // is shown. relayoutDocument() will take care of setting the page size to the
     // viewport dimensions later.
     doc->setTextWidth(0);
+    doc->setTextWidth(-1);
     doc->documentLayout()->setPaintDevice(viewport);
     doc->setDefaultFont(q->font());
 …
 #ifndef QT_NO_CURSOR
     viewport->setCursor(Qt::IBeamCursor);
+#endif
+    originalOffsetY = 0;
+#ifdef Q_WS_WIN
+    setSingleFingerPanEnabled(true);
 #endif
+}
 …
     plain text.
     \ingroup text
+    \mainclass
+    \ingroup richtext-processing
     \tableofcontents
 …
     QTextEdit, but is optimized for plain text handling.
     QPlainTextEdit works on paragraphs and characters. A paragraph is a
     formatted string which is word-wrapped to fit into the width of
+    QPlainTextEdit works on paragraphs and characters. A paragraph is
+    a formatted string which is word-wrapped to fit into the width of
     the widget. By default when reading plain text, one newline
     signifies a paragraph. A document consists of zero or more
+    paragraphs. The words in the paragraph are aligned in accordance
+    with the paragraph's alignment. Paragraphs are separated by hard
+    line breaks. Each character within a paragraph has its own
+    attributes, for example, font and color.
+    paragraphs. Paragraphs are separated by hard line breaks. Each
+    character within a paragraph has its own attributes, for example,
+    font and color.
     The shape of the mouse cursor on a QPlainTextEdit is
 …
     \section1 Using QPlainTextEdit as a Display Widget
+    The text is set or replaced using setPlainText() which deletes any
+    existing text and replaces it with the text passed in the
+    setPlainText() call.
+    Text itself can be inserted using the QTextCursor class or using
+    the convenience functins insertPlainText(), appendPlainText() or
+    The text is set or replaced using setPlainText() which deletes the
+    existing text and replaces it with the text passed to setPlainText().
+    Text can be inserted using the QTextCursor class or using the
+    convenience functions insertPlainText(), appendPlainText() or
     paste().
     By default the text edit wraps words at whitespace to fit within
+    By default, the text edit wraps words at whitespace to fit within
     the text edit widget. The setLineWrapMode() function is used to
     specify the kind of line wrap you want, \l WidgetWidth or \l
 …
     \sa QTextDocument, QTextCursor, {Application Example},
+        {Syntax Highlighter Example}, {Rich Text Processing}
+        {Code Editor Example}, {Syntax Highlighter Example},
+        {Rich Text Processing}
 */
 …
+    }
 #endif
+    else if (e->type() == QEvent::Gesture) {
+        QGestureEvent *ge = static_cast<QGestureEvent *>(e);
+        QPanGesture *g = static_cast<QPanGesture *>(ge->gesture(Qt::PanGesture));
+        if (g) {
+            QScrollBar *hBar = horizontalScrollBar();
+            QScrollBar *vBar = verticalScrollBar();
+            if (g->state() == Qt::GestureStarted)
+                d->originalOffsetY = vBar->value();
+            QPointF offset = g->offset();
+            if (!offset.isNull()) {
+                if (QApplication::isRightToLeft())
+                    offset.rx() *= -1;
+                // QPlainTextEdit scrolls by lines only in vertical direction
+                QFontMetrics fm(document()->defaultFont());
+                int lineHeight = fm.height();
+                int newX = hBar->value() - g->delta().x();
+                int newY = d->originalOffsetY - offset.y()/lineHeight;
+                hBar->setValue(newX);
+                vBar->setValue(newY);
+            }
+        }
+        return true;
+    }
     return QAbstractScrollArea::event(e);
+}
 …
 #endif
+    if (!(d->control->textInteractionFlags() & Qt::TextEditable)) {
+#ifndef QT_NO_SHORTCUT
+    Qt::TextInteractionFlags tif = d->control->textInteractionFlags();
+    if (tif & Qt::TextSelectableByKeyboard){
+        if (e == QKeySequence::SelectPreviousPage) {
+            e->accept();
+            d->pageUpDown(QTextCursor::Up, QTextCursor::KeepAnchor);
+            return;
+        } else if (e ==QKeySequence::SelectNextPage) {
+            e->accept();
+            d->pageUpDown(QTextCursor::Down, QTextCursor::KeepAnchor);
+            return;
+        }
+    }
+    if (tif & (Qt::TextSelectableByKeyboard | Qt::TextEditable)) {
+        if (e == QKeySequence::MoveToPreviousPage) {
+            e->accept();
+            d->pageUpDown(QTextCursor::Up, QTextCursor::MoveAnchor);
+            return;
+        } else if (e == QKeySequence::MoveToNextPage) {
+            e->accept();
+            d->pageUpDown(QTextCursor::Down, QTextCursor::MoveAnchor);
+            return;
+        }
+    }
+    if (!(tif & Qt::TextEditable)) {
         switch (e->key()) {
             case Qt::Key_Space:
 …
         return;
+    }
-#ifndef QT_NO_SHORTCUT
-    if (e == QKeySequence::MoveToPreviousPage) {
-            e->accept();
-            d->pageUpDown(QTextCursor::Up, QTextCursor::MoveAnchor);
-            return;
-    } else if (e == QKeySequence::MoveToNextPage) {
-            e->accept();
-            d->pageUpDown(QTextCursor::Down, QTextCursor::MoveAnchor);
-            return;
-    } else if (e == QKeySequence::SelectPreviousPage) {
-            e->accept();
-            d->pageUpDown(QTextCursor::Up, QTextCursor::KeepAnchor);
-            return;
-    } else if (e ==QKeySequence::SelectNextPage) {
-            e->accept();
-            d->pageUpDown(QTextCursor::Down, QTextCursor::KeepAnchor);
-            return;
+    }
 #endif // QT_NO_SHORTCUT
     d->sendControlEvent(e);
 …
                     // Cursor position didn't change, so we want to leave
                     // these keys to change focus.
+                    e->ignore();
+                    return;
+                }
+                break;
+            case Qt::Key_Left:
+            case Qt::Key_Right:
+                if (QApplication::keypadNavigationEnabled()
+                        && QApplication::navigationMode() == Qt::NavigationModeKeypadDirectional) {
+                    // Same as for Key_Up and Key_Down.
                     e->ignore();
                     return;
 …
     if (brush.style() >= Qt::LinearGradientPattern && brush.style() <= Qt::ConicalGradientPattern) {
         if (!gradientRect.isNull()) {
+            QTransform m;
+            m.translate(gradientRect.left(), gradientRect.top());
+            QTransform m = QTransform::fromTranslate(gradientRect.left(), gradientRect.top());
             m.scale(gradientRect.width(), gradientRect.height());
             brush.setTransform(m);
 …
     QTextBlock block = firstVisibleBlock();
     qreal maximumWidth = document()->documentLayout()->documentSize().width();
+    // Set a brush origin so that the WaveUnderline knows where the wave started
+    painter.setBrushOrigin(offset);
     // keep right margin clean from full-width selection
     int maxX = offset.x() + qMax((qreal)viewportRect.width(), maximumWidth)
 …
         d->ensureCursorVisible();
+    }
+    if (!isReadOnly() && rect().contains(e->pos()))
+        d->handleSoftwareInputPanel(e->button(), d->clickCausedFocus);
+    d->clickCausedFocus = 0;
+}
 …
 #endif
     d->sendControlEvent(e);
+    ensureCursorVisible();
+}
 …
+{
     Q_D(QPlainTextEdit);
+    if (e->reason() == Qt::MouseFocusReason) {
+        d->clickCausedFocus = 1;
+    }
     QAbstractScrollArea::focusInEvent(e);
     d->sendControlEvent(e);
 …
         flags = Qt::TextEditorInteraction;
+    }
     setAttribute(Qt::WA_InputMethodEnabled, !ro);
+    setAttribute(Qt::WA_InputMethodEnabled, shouldEnableInputMethod(this));
     d->control->setTextInteractionFlags(flags);
+}

trunk/src/gui/widgets/qplaintextedit.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     Q_PRIVATE_SLOT(d_func(), void _q_verticalScrollbarActionTriggered(int))
     Q_PRIVATE_SLOT(d_func(), void _q_cursorPositionChanged())
     friend class QPlainTextEditControl;
 };

trunk/src/gui/widgets/qplaintextedit_p.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
+    }
     inline QRectF cursorRect() { return cursorRect(textCursor()); }
+    void ensureCursorVisible() { textEdit->ensureCursorVisible(); }
+    void ensureCursorVisible() {
+        textEdit->ensureCursorVisible();
+        emit microFocusChanged();
+    }
 …
     uint centerOnScroll : 1;
     uint inDrag : 1;
+    uint clickCausedFocus : 1;
     int topLine;
 …
     void _q_cursorPositionChanged();
+    void _q_modificationChanged(bool);
     void _q_modificationChanged(bool);
+    int originalOffsetY;
 };

trunk/src/gui/widgets/qprintpreviewwidget.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #include "qprintpreviewwidget.h"
+#include "private/qwidget_p.h"
 #include <private/qprinter_p.h>
 …
     QRectF paperRect(0,0, paperSize.width(), paperSize.height());
+    painter->setClipRect(paperRect & option->exposedRect);
+    painter->fillRect(paperRect, Qt::white);
+    if (!pagePicture)
+        return;
+    painter->drawPicture(pageRect.topLeft(), *pagePicture);
+    // Effect: make anything drawn in the margins look washed out.
+    QPainterPath path;
+    path.addRect(paperRect);
+    path.addRect(pageRect);
+    painter->setPen(QPen(Qt::NoPen));
+    painter->setBrush(QColor(255, 255, 255, 180));
+    painter->drawPath(path);
+    // Draw shadow
     painter->setClipRect(option->exposedRect);
-#if 0
-    // Draw frame around paper.
-    painter->setPen(QPen(Qt::black, 0));
-    painter->setBrush(Qt::NoBrush);
-    painter->drawRect(paperRect);
-#endif
-    // Draw shadow
     qreal shWidth = paperRect.width()/100;
     QRectF rshadow(paperRect.topRight() + QPointF(0, shWidth),
 …
     painter->fillRect(cshadow, QBrush(cgrad));
+    painter->setClipRect(paperRect & option->exposedRect);
+    painter->fillRect(paperRect, Qt::white);
+    if (!pagePicture)
+        return;
+    painter->drawPicture(pageRect.topLeft(), *pagePicture);
+    // Effect: make anything drawn in the margins look washed out.
+    QPainterPath path;
+    path.addRect(paperRect);
+    path.addRect(pageRect);
+    painter->setPen(QPen(Qt::NoPen));
+    painter->setBrush(QColor(255, 255, 255, 180));
+    painter->drawPath(path);
+#if 0
+    // Draw frame around paper.
+    painter->setPen(QPen(Qt::black, 0));
+    painter->setBrush(Qt::NoBrush);
+    painter->drawRect(paperRect);
+#endif
     // todo: drawtext "Page N" below paper
+}
 …
 } // anonymous namespace
 class QPrintPreviewWidgetPrivate
+class QPrintPreviewWidgetPrivate : public QWidgetPrivate
+{
     Q_DECLARE_PUBLIC(QPrintPreviewWidget)
 public:
     QPrintPreviewWidgetPrivate(QPrintPreviewWidget *q)
         : q_ptr(q), scene(0), curPage(1),
+    QPrintPreviewWidgetPrivate()
+        : scene(0), curPage(1),
           viewMode(QPrintPreviewWidget::SinglePageView),
           zoomMode(QPrintPreviewWidget::FitInView),
 …
     int calcCurrentPage();
-    QPrintPreviewWidget *q_ptr;
     GraphicsView *graphicsView;
     QGraphicsScene *scene;
 …
     previewing page layouts for printer output.
     \ingroup multimedia
+    \ingroup printing
     QPrintPreviewDialog uses a QPrintPreviewWidget internally, and the
 …
 */
 QPrintPreviewWidget::QPrintPreviewWidget(QPrinter *printer, QWidget *parent, Qt::WindowFlags flags)
     : QWidget(parent, flags), d_ptr(new QPrintPreviewWidgetPrivate(this))
+    : QWidget(*new QPrintPreviewWidgetPrivate, parent, flags)
+{
     Q_D(QPrintPreviewWidget);
 …
 */
 QPrintPreviewWidget::QPrintPreviewWidget(QWidget *parent, Qt::WindowFlags flags)
     : QWidget(parent, flags), d_ptr(new QPrintPreviewWidgetPrivate(this))
+    : QWidget(*new QPrintPreviewWidgetPrivate, parent, flags)
+{
     Q_D(QPrintPreviewWidget);
 …
     if (d->ownPrinter)
         delete d->printer;
-    delete d_ptr;
+}
 …
 /*!
+    \obsolete
     Returns the number of pages in the preview.
+    \sa pageCount()
 */
 int QPrintPreviewWidget::numPages() const
+{
+    Q_D(const QPrintPreviewWidget);
+    return d->pages.size();
+}
+/*!
+    \since 4.6
+    Returns the number of pages in the preview.
+*/
+int QPrintPreviewWidget::pageCount() const
+{
     Q_D(const QPrintPreviewWidget);

trunk/src/gui/widgets/qprintpreviewwidget.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     ZoomMode zoomMode() const;
     int currentPage() const;
+    int numPages() const;
+#ifdef QT_DEPRECATED
+    QT_DEPRECATED int numPages() const;
+#endif
+    int pageCount() const;
     void setVisible(bool visible);
 …
 private:
     QPrintPreviewWidgetPrivate *d_ptr;
+    void *dummy; // ### remove in Qt 5.0
     Q_PRIVATE_SLOT(d_func(), void _q_fit())
     Q_PRIVATE_SLOT(d_func(), void _q_updateCurrentPage())

trunk/src/gui/widgets/qprogressbar.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     \ingroup basicwidgets
+    \mainclass
     A progress bar is used to give the user an indication of the
 …
     beginning with reset().
+    If minimum and maximum both are set to 0, the bar shows a busy indicator
+    instead of a percentage of steps. This is useful, for example, when using
+    QFtp or QHttp to download items when they are unable to determine the
+    size of the item being downloaded.
+    If minimum and maximum both are set to 0, the bar shows a busy
+    indicator instead of a percentage of steps. This is useful, for
+    example, when using QFtp or QNetworkAccessManager to download
+    items when they are unable to determine the size of the item being
+    downloaded.
     \table
 …
     \endtable
     \sa QTimeLine, QProgressDialog, {fowler}{GUI Design Handbook: Progress Indicator}
+    \sa QProgressDialog, {fowler}{GUI Design Handbook: Progress Indicator}
 */
 …
     \brief whether the current completed percentage should be displayed
+    This property may be ignored by the style (e.g., QMacStyle never draws the text).
     \sa textDirection
 */
 …
+{
     Q_D(const QProgressBar);
     if (d->maximum == 0 || d->value < d->minimum
+    if ((d->maximum == 0 && d->minimum == 0) || d->value < d->minimum
             || (d->value == INT_MIN && d->minimum == INT_MIN))
         return QString();
     qint64 totalSteps = qint64(d->maximum) - qint64(d->minimum);
+    qint64 totalSteps = qint64(d->maximum) - d->minimum;
     QString result = d->format;
     result.replace(QLatin1String("%m"), QString::fromLatin1("%1").arg(totalSteps));
     result.replace(QLatin1String("%v"), QString::fromLatin1("%1").arg(d->value));
+    result.replace(QLatin1String("%m"), QString::number(totalSteps));
+    result.replace(QLatin1String("%v"), QString::number(d->value));
     // If max and min are equal and we get this far, it means that the
 …
     // 100% here in order to avoid division by zero further down.
     if (totalSteps == 0) {
         result.replace(QLatin1String("%p"), QString::fromLatin1("%1").arg(100));
+        result.replace(QLatin1String("%p"), QString::number(100));
         return result;
+    }
     int progress = int(((qreal(d->value) - qreal(d->minimum)) * 100.0) / totalSteps);
     result.replace(QLatin1String("%p"), QString::fromLatin1("%1").arg(progress));
+    int progress = (qreal(d->value) - d->minimum) * 100.0 / totalSteps;
+    result.replace(QLatin1String("%p"), QString::number(progress));
     return result;
+}

trunk/src/gui/widgets/qprogressbar.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/qpushbutton.cpp

-              r306
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #endif
+#include "private/qmenu_p.h"
 #include "private/qpushbutton_p.h"
 …
     \ingroup basicwidgets
+    \mainclass
     The push button, or command button, is perhaps the most commonly
 …
+{
     Q_D(const QPushButton);
     if (d->sizeHint.isValid())
+    if (d->sizeHint.isValid() && d->lastAutoDefault == autoDefault())
         return d->sizeHint;
+    d->lastAutoDefault = autoDefault();
     ensurePolished();
 …
     if (menu && !d->menu) {
+        disconnect(this, SIGNAL(pressed()), this, SLOT(_q_popupPressed()));
+        connect(this, SIGNAL(pressed()), this, SLOT(_q_popupPressed()));
+        connect(this, SIGNAL(pressed()), this, SLOT(_q_popupPressed()), Qt::UniqueConnection);
+    }
     if (d->menu)
 …
     menu->setNoReplayFor(q);
+    QPoint menuPos = adjustedMenuPosition();
+    QPointer<QPushButton> guard(q);
+    QMenuPrivate::get(menu)->causedPopup.widget = guard;
+    //Because of a delay in menu effects, we must keep track of the
+    //menu visibility to avoid flicker on button release
+    menuOpen = true;
+    menu->exec(menuPos);
+    if (guard) {
+        menuOpen = false;
+        q->setDown(false);
+    }
+}
+QPoint QPushButtonPrivate::adjustedMenuPosition()
+{
+    Q_Q(QPushButton);
     bool horizontal = true;
 #if !defined(QT_NO_TOOLBAR)
     QToolBar *tb = qobject_cast<QToolBar*>(q->parentWidget());
+    QToolBar *tb = qobject_cast<QToolBar*>(parent);
     if (tb && tb->orientation() == Qt::Vertical)
         horizontal = false;
 #endif
     QWidgetItem item(q);
     QRect rect = item.geometry();
 …
     int y = globalPos.y();
     if (horizontal) {
         if (globalPos.y() + rect.height() + menuSize.height() <= qApp->desktop()->height()) {
+        if (globalPos.y() + rect.height() + menuSize.height() <= QApplication::desktop()->availableGeometry(q).height()) {
             y += rect.height();
         } else {
 …
             x += rect.width() - menuSize.width();
     } else {
         if (globalPos.x() + rect.width() + menu->sizeHint().width() <= qApp->desktop()->width())
+        if (globalPos.x() + rect.width() + menu->sizeHint().width() <= QApplication::desktop()->availableGeometry(q).width())
             x += rect.width();
         else
             x -= menuSize.width();
+    }
+    QPointer<QPushButton> guard(q);
+    //Because of a delay in menu effects, we must keep track of the
+    //menu visibility to avoid flicker on button release
+    menuOpen = true;
+    menu->exec(QPoint(x, y));
+    if (guard) {
+        menuOpen = false;
+        // on some platforms (e.g. OS/2) QPushButton::focusOutEvent() may be called
+        // before we return from exec() above (for example, as a result of window
+        // deactivation). It will set down to false but since menuOpen won't be
+        // false yet, the button will be redrawn as sunken still. Simple setDown(false)
+        // won't do anything in this case so we need to call update() instead to make
+        // sure the button is redrawn as unsunken.
+        if (down)
+            q->setDown(false);
+        else
+            q->update();
+    }
+}
+    return QPoint(x,y);
+}
 #endif // QT_NO_MENU
 …
                 d->resetLayoutItemMargins();
                 updateGeometry();
+    } else if (e->type() == QEvent::PolishRequest) {
+        updateGeometry();
+    }
     return QAbstractButton::event(e);

trunk/src/gui/widgets/qpushbutton.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/qpushbutton_p.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     QPushButtonPrivate()
         : QAbstractButtonPrivate(QSizePolicy::PushButton), autoDefault(Auto),
           defaultButton(false), flat(false), menuOpen(false) {}
+          defaultButton(false), flat(false), menuOpen(false), lastAutoDefault(false) {}
     inline void init() { resetLayoutItemMargins(); }
+    static QPushButtonPrivate* get(QPushButton *b) { return b->d_func(); }
+#ifndef QT_NO_MENU
+    QPoint adjustedMenuPosition();
+#endif
     void resetLayoutItemMargins();
     void _q_popupPressed();
 …
     uint flat : 1;
     uint menuOpen : 1;
+    mutable uint lastAutoDefault : 1;
 };

trunk/src/gui/widgets/qradiobutton.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     \ingroup basicwidgets
+    \mainclass
     A QRadioButton is an option button that can be switched on (checked) or

trunk/src/gui/widgets/qradiobutton.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/qrubberband.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     \brief The QRubberBand class provides a rectangle or line that can
     indicate a selection or a boundary.
-    \ingroup misc
-    \mainclass
     A rubber band is often used to show a new bounding area (as in a

trunk/src/gui/widgets/qrubberband.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/qscrollarea.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     \ingroup basicwidgets
+    \mainclass
     A scroll area is used to display the contents of a child widget
 …
     property to one which provides constraints on the minimum and/or
     maximum size of the layout (e.g., QLayout::SetMinAndMaxSize) will
     cause the size of the the scroll area to be updated whenever the
+    cause the size of the scroll area to be updated whenever the
     contents of the layout changes.

trunk/src/gui/widgets/qscrollarea.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/qscrollarea_p.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/qscrollbar.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     q->setAttribute(Qt::WA_WState_OwnSizePolicy, false);
     q->setAttribute(Qt::WA_OpaquePaintEvent);
+#if !defined(QT_NO_CONTEXTMENU) && defined(Q_WS_WINCE)
+    if (!q->style()->styleHint(QStyle::SH_ScrollBar_ContextMenu, 0, q)) {
+        q->setContextMenuPolicy(Qt::PreventContextMenu);
+    }
+#endif
+}

trunk/src/gui/widgets/qscrollbar.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/qsizegrip.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     Qt::Corner m_corner;
     bool gotMousePress;
+    QWidget *tlw;
 #ifdef Q_WS_MAC
     void updateMacSizer(bool hide) const;
 …
+    {
         return m_corner == Qt::BottomLeftCorner || m_corner == Qt::TopLeftCorner;
+    }
+    void updateTopLevelWidget()
+    {
+        Q_Q(QSizeGrip);
+        QWidget *w = qt_sizegrip_topLevelWidget(q);
+        if (tlw == w)
+            return;
+        if (tlw)
+            tlw->removeEventFilter(q);
+        tlw = w;
+        if (tlw)
+            tlw->installEventFilter(q);
+    }
 …
         Q_Q(QSizeGrip);
         bool showSizeGrip = !(q->isHidden() && q->testAttribute(Qt::WA_WState_ExplicitShowHide));
         QWidget *tlw = qt_sizegrip_topLevelWidget(q);
+        updateTopLevelWidget();
         if (tlw && showSizeGrip) {
             Qt::WindowStates sizeGripNotVisibleState = Qt::WindowFullScreen;
 …
+{
     Q_Q(const QSizeGrip);
     if (QApplication::closingDown() || !q->parentWidget())
+    if (QApplication::closingDown() || !parent)
         return;
     QWidget *topLevelWindow = qt_sizegrip_topLevelWidget(const_cast<QSizeGrip *>(q));
 …
     \brief The QSizeGrip class provides a resize handle for resizing top-level windows.
     \ingroup application
+    \ingroup mainwindow-classes
     \ingroup basicwidgets
-    \ingroup appearance
     This widget works like the standard Windows resize handle. In the
 …
     dxMax = 0;
     dyMax = 0;
+    tlw = 0;
     m_corner = q->isLeftToRight() ? Qt::BottomRightCorner : Qt::BottomLeftCorner;
     gotMousePress = false;
 …
 #endif
     q->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed));
+    QWidget *tlw = qt_sizegrip_topLevelWidget(q);
+    tlw->installEventFilter(q);
+    updateTopLevelWidget();
+}
 …
         ReleaseCapture();
+        QT_WA_INLINE(PostMessageW(tlw->winId(), WM_SYSCOMMAND, orientation, 0),
+                     PostMessageA(tlw->winId(), WM_SYSCOMMAND, orientation, 0));
+        PostMessage(tlw->winId(), WM_SYSCOMMAND, orientation, 0);
         return;
+    }
 …
 bool QSizeGrip::eventFilter(QObject *o, QEvent *e)
+{
+    Q_D(QSizeGrip);
     if ((isHidden() && testAttribute(Qt::WA_WState_ExplicitShowHide))
+        || e->type() != QEvent::WindowStateChange) {
+        || e->type() != QEvent::WindowStateChange
+                || o != d->tlw) {
         return QWidget::eventFilter(o, e);
+    }
-    QWidget *tlw = qt_sizegrip_topLevelWidget(this);
-    if (o != tlw)
-        return QWidget::eventFilter(o, e);
     Qt::WindowStates sizeGripNotVisibleState = Qt::WindowFullScreen;
 #ifndef Q_WS_MAC
 …
 #endif
     // Don't show the size grip if the tlw is maximized or in full screen mode.
     setVisible(!(tlw->windowState() & sizeGripNotVisibleState));
+    setVisible(!(d->tlw->windowState() & sizeGripNotVisibleState));
     setAttribute(Qt::WA_WState_ExplicitShowHide, false);
     return QWidget::eventFilter(o, e);

trunk/src/gui/widgets/qsizegrip.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/qslider.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     QSlider::TickPosition tickPosition;
     int clickOffset;
-    int snapBackPosition;
     void init();
         void resetLayoutItemMargins();
 …
     \ingroup basicwidgets
+    \mainclass
     The slider is the classic widget for controlling a bounded value.
 …
         QRect sr = style()->subControlRect(QStyle::CC_Slider, &opt, QStyle::SC_SliderHandle, this);
         d->clickOffset = d->pick(ev->pos() - sr.topLeft());
-        d->snapBackPosition = d->position;
         update(sr);
         setSliderDown(true);
 …
     QStyleOptionSlider opt;
     initStyleOption(&opt);
-    int m = style()->pixelMetric(QStyle::PM_MaximumDragDistance, &opt, this);
-    if (m >= 0) {
-        QRect r = rect();
-        r.adjust(-m, -m, m, m);
-        if (!r.contains(ev->pos())) {
-            newPosition = d->snapBackPosition;
+    }
+    }
     setSliderPosition(newPosition);
+}

trunk/src/gui/widgets/qslider.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     inline QT3_SUPPORT TickPosition tickmarks() const { return tickPosition(); }
 public Q_SLOTS:
     inline QT_MOC_COMPAT void addStep() { triggerAction(SliderSingleStepAdd); };
     inline QT_MOC_COMPAT void subtractStep() { triggerAction(SliderSingleStepSub); };
+    inline QT_MOC_COMPAT void addStep() { triggerAction(SliderSingleStepAdd); }
+    inline QT_MOC_COMPAT void subtractStep() { triggerAction(SliderSingleStepSub); }
 #endif

trunk/src/gui/widgets/qspinbox.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #include <math.h>
+#include <float.h>
 QT_BEGIN_NAMESPACE
 …
 #endif
-static bool isIntermediateValueHelper(qint64 num, qint64 minimum, qint64 maximum, qint64 *match = 0);
 class QSpinBoxPrivate : public QAbstractSpinBoxPrivate
+{
     Q_DECLARE_PUBLIC(QSpinBox)
 public:
     QSpinBoxPrivate(QWidget *parent = 0);
+    QSpinBoxPrivate();
     void emitSignals(EmitPolicy ep, const QVariant &);
 …
     QVariant validateAndInterpret(QString &input, int &pos,
                                   QValidator::State &state) const;
-    bool isIntermediateValue(const QString &str) const;
-    QChar thousand;
     inline void init() {
+        Q_Q(QSpinBox);
+        q->setInputMethodHints(Qt::ImhDigitsOnly);
         setLayoutItemMargins(QStyle::SE_SpinBoxLayoutItem);
+    }
 …
     Q_DECLARE_PUBLIC(QDoubleSpinBox)
 public:
     QDoubleSpinBoxPrivate(QWidget *parent = 0);
+    QDoubleSpinBoxPrivate();
     void emitSignals(EmitPolicy ep, const QVariant &);
-    bool isIntermediateValue(const QString &str) const;
     virtual QVariant valueFromText(const QString &n) const;
 …
     // variables
     int decimals;
+    QChar delimiter, thousand;
+    inline void init() {
+        Q_Q(QDoubleSpinBox);
+        q->setInputMethodHints(Qt::ImhFormattedNumbersOnly);
+    }
 };
 …
     \ingroup basicwidgets
+    \mainclass
     QSpinBox is designed to handle integers and discrete sets of
 …
 QSpinBox::QSpinBox(QWidget *parent)
     : QAbstractSpinBox(*new QSpinBoxPrivate(parent), parent)
+    : QAbstractSpinBox(*new QSpinBoxPrivate, parent)
+{
     Q_D(QSpinBox);
 …
 */
 QSpinBox::QSpinBox(QWidget *parent, const char *name)
     : QAbstractSpinBox(*new QSpinBoxPrivate(parent), parent)
+    : QAbstractSpinBox(*new QSpinBoxPrivate, parent)
+{
     Q_D(QSpinBox);
 …
 */
 QSpinBox::QSpinBox(int minimum, int maximum, int step, QWidget *parent, const char *name)
     : QAbstractSpinBox(*new QSpinBoxPrivate(parent), parent)
+    : QAbstractSpinBox(*new QSpinBoxPrivate, parent)
+{
     Q_D(QSpinBox);
 …
     d->prefix = prefix;
     d->updateEdit();
+    d->cachedSizeHint = QSize();
+    updateGeometry();
+}
 …
     d->suffix = suffix;
     d->updateEdit();
+    d->cachedSizeHint = QSize();
+    updateGeometry();
+}
 …
 QString QSpinBox::textFromValue(int value) const
+{
-    Q_D(const QSpinBox);
     QString str = locale().toString(value);
     if (qAbs(value) >= 1000 || value == INT_MIN) {
         str.remove(d->thousand);
+        str.remove(locale().groupSeparator());
+    }
 …
 void QSpinBox::fixup(QString &input) const
+{
+    Q_D(const QSpinBox);
+    input.remove(d->thousand);
+    input.remove(locale().groupSeparator());
+}
 …
     \ingroup basicwidgets
+    \mainclass
     QDoubleSpinBox allows the user to choose a value by clicking the
 …
 */
 QDoubleSpinBox::QDoubleSpinBox(QWidget *parent)
+    : QAbstractSpinBox(*new QDoubleSpinBoxPrivate(parent), parent)
+{
+    : QAbstractSpinBox(*new QDoubleSpinBoxPrivate, parent)
+{
+    Q_D(QDoubleSpinBox);
+    d->init();
+}
 …
      interpreting doubles.
      \warning The results might not be reliable with very high values
      for \a decimals.
+     \warning The maximum value for \a decimals is DBL_MAX_10_EXP +
+     DBL_DIG (ie. 323) because of the limitations of the double type.
      Note: The maximum, minimum and value might change as a result of
 …
+{
     Q_D(QDoubleSpinBox);
     d->decimals = qMax(0, decimals);
+    d->decimals = qBound(0, decimals, DBL_MAX_10_EXP + DBL_DIG);
     setRange(minimum(), maximum()); // make sure values are rounded
 …
     QString str = locale().toString(value, 'f', d->decimals);
     if (qAbs(value) >= 1000.0) {
         str.remove(d->thousand);
+        str.remove(locale().groupSeparator());
+    }
     return str;
 …
 void QDoubleSpinBox::fixup(QString &input) const
+{
+    Q_D(const QDoubleSpinBox);
+    input.remove(d->thousand);
+    input.remove(locale().groupSeparator());
+}
 …
 */
 QSpinBoxPrivate::QSpinBoxPrivate(QWidget *parent)
+QSpinBoxPrivate::QSpinBoxPrivate()
+{
     minimum = QVariant((int)0);
 …
     singleStep = QVariant((int)1);
     type = QVariant::Int;
-    const QString str = (parent ? parent->locale() : QLocale()).toString(4567);
-    if (str.size() == 5) {
-        thousand = QChar(str.at(1));
+    }
+}
 …
 /*!
-  \internal
-  Return true if str can become a number which is between minimum and
-  maximum or false if this is not possible.
-*/
-bool QSpinBoxPrivate::isIntermediateValue(const QString &str) const
+{
-    const int num = q_func()->locale().toInt(str, 0, 10);
-    const int min = minimum.toInt();
-    const int max = maximum.toInt();
-    int numDigits = 0;
-    int digits[10];
-    int tmp = num;
-    if (tmp == 0) {
-        numDigits = 1;
-        digits[0] = 0;
-    } else {
-        tmp = num;
-        for (int i=0; tmp != 0; ++i) {
-            digits[numDigits++] = qAbs(tmp % 10);
-            tmp /= 10;
+        }
+    }
-    int failures = 0;
-    for (int number=min; /*number<=max*/; ++number) {
-        tmp = number;
-        for (int i=0; tmp != 0;) {
-            if (digits[i] == qAbs(tmp % 10)) {
-                if (++i == numDigits)
-                    return true;
+            }
-            tmp /= 10;
+        }
-        if (failures++ == 500000) //upper bound
-            return true;
-        if (number == max) // needed for INT_MAX
-            break;
+    }
-    return false;
+}
-/*!
     \internal Multi purpose function that parses input, sets state to
     the appropriate state and returns the value it will be interpreted
 …
     if (cachedText == input && !input.isEmpty()) {
         state = cachedState;
         QSBDEBUG() << "cachedText was" << "'" << cachedText << "'" << "state was "
+        QSBDEBUG() << "cachedText was '" << cachedText << "' state was "
                    << state << " and value was " << cachedValue;
 …
         state = QValidator::Intermediate;
         QSBDEBUG() << __FILE__ << __LINE__<< "num is set to" << num;
     } else if (copy.startsWith(QLatin1String("-")) && min >= 0) {
+    } else if (copy.startsWith(QLatin1Char('-')) && min >= 0) {
         state = QValidator::Invalid; // special-case -0 will be interpreted as 0 and thus not be invalid with a range from 0-100
     } else {
         bool ok = false;
+        bool removedThousand = false;
+        num = q_func()->locale().toInt(copy, &ok, 10);
+        if (!ok && copy.contains(thousand) && (max >= 1000 || min <= -1000)) {
+            const int s = copy.size();
+            copy.remove(thousand);
+            pos = qMax(0, pos - (s - copy.size()));
+            removedThousand = true;
+            num = q_func()->locale().toInt(copy, &ok, 10);
+        num = locale.toInt(copy, &ok, 10);
+        if (!ok && copy.contains(locale.groupSeparator()) && (max >= 1000 || min <= -1000)) {
+            QString copy2 = copy;
+            copy2.remove(locale.groupSeparator());
+            num = locale.toInt(copy2, &ok, 10);
+        }
         QSBDEBUG() << __FILE__ << __LINE__<< "num is set to" << num;
 …
             state = QValidator::Invalid;
         } else if (num >= min && num <= max) {
             state = removedThousand ? QValidator::Intermediate : QValidator::Acceptable;
+            state = QValidator::Acceptable;
         } else if (max == min) {
             state = QValidator::Invalid;
 …
                 QSBDEBUG() << __FILE__ << __LINE__<< "state is set to Invalid";
             } else {
+                state = isIntermediateValue(copy) ? QValidator::Intermediate : QValidator::Invalid;
+                QSBDEBUG() << __FILE__ << __LINE__<< "state is set to "
+                           << (state == QValidator::Intermediate ? "Intermediate" : "Acceptable");
+                state = QValidator::Intermediate;
+                QSBDEBUG() << __FILE__ << __LINE__<< "state is set to Intermediate";
+            }
+        }
 …
 */
 QDoubleSpinBoxPrivate::QDoubleSpinBoxPrivate(QWidget *parent)
+QDoubleSpinBoxPrivate::QDoubleSpinBoxPrivate()
+{
     minimum = QVariant(0.0);
 …
     decimals = 2;
     type = QVariant::Double;
-    const QString str = (parent ? parent->locale() : QLocale()).toString(4567.1);
-    if (str.size() == 6) {
-        delimiter = str.at(4);
-        thousand = QChar((ushort)0);
-    } else if (str.size() == 7) {
-        thousand = str.at(1);
-        delimiter = str.at(5);
+    }
-    Q_ASSERT(!delimiter.isNull());
+}
 …
-bool QDoubleSpinBoxPrivate::isIntermediateValue(const QString &str) const
+{
-    QSBDEBUG() << "input is" << str << minimum << maximum;
-    qint64 dec = 1;
-    for (int i=0; i<decimals; ++i)
-        dec *= 10;
-    const QLatin1Char dot('.');
-    // I know QString::number() uses CLocale so I use dot
-    const QString minstr = QString::number(minimum.toDouble(), 'f', decimals);
-    bool ok;
-    qint64 min_left = minstr.left(minstr.indexOf(dot)).toLongLong(&ok);
-    if (!ok)
-        return false;
-    qint64 min_right = minstr.mid(minstr.indexOf(dot) + 1).toLongLong();
-    const QString maxstr = QString::number(maximum.toDouble(), 'f', decimals);
-    qint64 max_left = maxstr.left(maxstr.indexOf(dot)).toLongLong(&ok);
-    if (!ok)
-        return true;
-    qint64 max_right = maxstr.mid(maxstr.indexOf(dot) + 1).toLongLong();
-    const int dotindex = str.indexOf(delimiter);
-    const bool negative = maximum.toDouble() < 0;
-    qint64 left = 0, right = 0;
-    bool doleft = true;
-    bool doright = true;
-    if (dotindex == -1) {
-        left = str.toLongLong();
-        doright = false;
-    } else if (dotindex == 0 || (dotindex == 1 && str.at(0) == QLatin1Char('+'))) {
-        if (negative) {
-            QSBDEBUG() << __FILE__ << __LINE__ << "returns false";
-            return false;
+        }
-        doleft = false;
-        right = str.mid(dotindex + 1).toLongLong();
-    } else if (dotindex == 1 && str.at(0) == QLatin1Char('-')) {
-        if (!negative) {
-            QSBDEBUG() << __FILE__ << __LINE__ << "returns false";
-            return false;
+        }
-        doleft = false;
-        right = str.mid(dotindex + 1).toLongLong();
-    } else {
-        left = str.left(dotindex).toLongLong();
-        if (dotindex == str.size() - 1) {
-            doright = false;
-        } else {
-            right = str.mid(dotindex + 1).toLongLong();
+        }
+    }
-    if ((left >= 0 && max_left < 0 && !str.startsWith(QLatin1Char('-'))) || (left < 0 && min_left >= 0)) {
-        QSBDEBUG("returns false 0");
-        return false;
+    }
-    qint64 match = min_left;
-    if (doleft && !isIntermediateValueHelper(left, min_left, max_left, &match)) {
-        QSBDEBUG() << __FILE__ << __LINE__ << "returns false";
-        return false;
+    }
-    if (doright) {
-        QSBDEBUG("match %lld min_left %lld max_left %lld", match, min_left, max_left);
-        if (!doleft) {
-            if (min_left == max_left) {
-                const bool ret = isIntermediateValueHelper(qAbs(left),
-                                                           negative ? max_right : min_right,
-                                                           negative ? min_right : max_right);
-                QSBDEBUG() << __FILE__ << __LINE__ << "returns" << ret;
-                return ret;
-            } else if (qAbs(max_left - min_left) == 1) {
-                const bool ret = isIntermediateValueHelper(qAbs(left), min_right, negative ? 0 : dec)
-                                 || isIntermediateValueHelper(qAbs(left), negative ? dec : 0, max_right);
-                QSBDEBUG() << __FILE__ << __LINE__ << "returns" << ret;
-                return ret;
-            } else {
-                const bool ret = isIntermediateValueHelper(qAbs(left), 0, dec);
-                QSBDEBUG() << __FILE__ << __LINE__ << "returns" << ret;
-                return ret;
+            }
+        }
-        if (match != min_left) {
-            min_right = negative ? dec : 0;
+        }
-        if (match != max_left) {
-            max_right = negative ? 0 : dec;
+        }
-        qint64 tmpl = negative ? max_right : min_right;
-        qint64 tmpr = negative ? min_right : max_right;
-        const bool ret = isIntermediateValueHelper(right, tmpl, tmpr);
-        QSBDEBUG() << __FILE__ << __LINE__ << "returns" << ret;
-        return ret;
+    }
-    QSBDEBUG() << __FILE__ << __LINE__ << "returns true";
-    return true;
+}
 /*!
     \internal
 …
 double QDoubleSpinBoxPrivate::round(double value) const
+{
+    Q_Q(const QDoubleSpinBox);
+    const QString strDbl = q->locale().toString(value, 'f', decimals);
+    return q->locale().toDouble(strDbl);
+    return QString::number(value, 'f', decimals).toDouble();
+}
 …
     if (cachedText == input && !input.isEmpty()) {
         state = cachedState;
         QSBDEBUG() << "cachedText was" << "'" << cachedText << "'" << "state was "
+        QSBDEBUG() << "cachedText was '" << cachedText << "' state was "
                    << state << " and value was " << cachedValue;
         return cachedValue;
 …
         goto end;
     case 1:
         if (copy.at(0) == delimiter
+        if (copy.at(0) == locale.decimalPoint()
             || (plus && copy.at(0) == QLatin1Char('+'))
             || (minus && copy.at(0) == QLatin1Char('-'))) {
 …
         break;
     case 2:
         if (copy.at(1) == delimiter
+        if (copy.at(1) == locale.decimalPoint()
             && ((plus && copy.at(0) == QLatin1Char('+')) || (minus && copy.at(0) == QLatin1Char('-')))) {
             state = QValidator::Intermediate;
 …
+    }
     if (copy.at(0) == thousand) {
+    if (copy.at(0) == locale.groupSeparator()) {
         QSBDEBUG() << __FILE__ << __LINE__<< "state is set to Invalid";
         state = QValidator::Invalid;
         goto end;
     } else if (len > 1) {
         const int dec = copy.indexOf(delimiter);
+        const int dec = copy.indexOf(locale.decimalPoint());
         if (dec != -1) {
             if (dec + 1 < copy.size() && copy.at(dec + 1) == delimiter && pos == dec + 1) {
+            if (dec + 1 < copy.size() && copy.at(dec + 1) == locale.decimalPoint() && pos == dec + 1) {
                 copy.remove(dec + 1, 1); // typing a delimiter when you are on the delimiter
             } // should be treated as typing right arrow
 …
+            }
             for (int i=dec + 1; i<copy.size(); ++i) {
                 if (copy.at(i).isSpace() || copy.at(i) == thousand) {
+                if (copy.at(i).isSpace() || copy.at(i) == locale.groupSeparator()) {
                     QSBDEBUG() << __FILE__ << __LINE__<< "state is set to Invalid";
                     state = QValidator::Invalid;
 …
             const QChar &last = copy.at(len - 1);
             const QChar &secondLast = copy.at(len - 2);
             if ((last == thousand || last.isSpace())
                 && (secondLast == thousand || secondLast.isSpace())) {
+            if ((last == locale.groupSeparator() || last.isSpace())
+                && (secondLast == locale.groupSeparator() || secondLast.isSpace())) {
                 state = QValidator::Invalid;
                 QSBDEBUG() << __FILE__ << __LINE__<< "state is set to Invalid";
                 goto end;
             } else if (last.isSpace() && (!thousand.isSpace() || secondLast.isSpace())) {
+            } else if (last.isSpace() && (!locale.groupSeparator().isSpace() || secondLast.isSpace())) {
                 state = QValidator::Invalid;
                 QSBDEBUG() << __FILE__ << __LINE__<< "state is set to Invalid";
 …
+    {
         bool ok = false;
+        QLocale loc(q_func()->locale());
+        num = loc.toDouble(copy, &ok);
+        QSBDEBUG() << __FILE__ << __LINE__ << loc << copy << num << ok;
+        bool notAcceptable = false;
+        num = locale.toDouble(copy, &ok);
+        QSBDEBUG() << __FILE__ << __LINE__ << locale << copy << num << ok;
         if (!ok) {
             if (thousand.isPrint()) {
                 if (max < 1000 && min > -1000 && copy.contains(thousand)) {
+            if (locale.groupSeparator().isPrint()) {
+                if (max < 1000 && min > -1000 && copy.contains(locale.groupSeparator())) {
                     state = QValidator::Invalid;
                     QSBDEBUG() << __FILE__ << __LINE__<< "state is set to Invalid";
 …
                 const int len = copy.size();
                 for (int i=0; i<len- 1; ++i) {
                     if (copy.at(i) == thousand && copy.at(i + 1) == thousand) {
+                    if (copy.at(i) == locale.groupSeparator() && copy.at(i + 1) == locale.groupSeparator()) {
                         QSBDEBUG() << __FILE__ << __LINE__<< "state is set to Invalid";
                         state = QValidator::Invalid;
 …
+                }
+                const int s = copy.size();
+                copy.remove(thousand);
+                pos = qMax(0, pos - (s - copy.size()));
+                num = loc.toDouble(copy, &ok);
+                QSBDEBUG() << thousand << num << copy << ok;
+                QString copy2 = copy;
+                copy2.remove(locale.groupSeparator());
+                num = locale.toDouble(copy2, &ok);
+                QSBDEBUG() << locale.groupSeparator() << num << copy2 << ok;
                 if (!ok) {
 …
                     goto end;
+                }
-                notAcceptable = true;
+            }
+        }
 …
             QSBDEBUG() << __FILE__ << __LINE__<< "state is set to Invalid";
         } else if (num >= min && num <= max) {
+            state = notAcceptable ? QValidator::Intermediate : QValidator::Acceptable;
+            QSBDEBUG() << __FILE__ << __LINE__<< "state is set to "
+                       << (state == QValidator::Intermediate ? "Intermediate" : "Acceptable");
+            state = QValidator::Acceptable;
+            QSBDEBUG() << __FILE__ << __LINE__<< "state is set to Acceptable";
         } else if (max == min) { // when max and min is the same the only non-Invalid input is max (or min)
             state = QValidator::Invalid;
 …
                 QSBDEBUG() << __FILE__ << __LINE__<< "state is set to Invalid";
             } else {
+                state = isIntermediateValue(copy) ? QValidator::Intermediate : QValidator::Invalid;
+                QSBDEBUG() << __FILE__ << __LINE__<< "state is set to "
+                           << (state == QValidator::Intermediate ? "Intermediate" : "Acceptable");
+                state = QValidator::Intermediate;
+                QSBDEBUG() << __FILE__ << __LINE__<< "state is set to Intermediate";
+            }
+        }
 …
     Use minimum() instead.
 */
-/*!
-    \internal Returns whether \a str is a string which value cannot be
-    parsed but still might turn into something valid.
-*/
-static bool isIntermediateValueHelper(qint64 num, qint64 min, qint64 max, qint64 *match)
+{
-    QSBDEBUG("%lld %lld %lld", num, min, max);
-    if (num >= min && num <= max) {
-        if (match)
-            *match = num;
-        QSBDEBUG("returns true 0");
-        return true;
+    }
-    qint64 tmp = num;
-    int numDigits = 0;
-    int digits[10];
-    if (tmp == 0) {
-        numDigits = 1;
-        digits[0] = 0;
-    } else {
-        tmp = qAbs(num);
-        for (int i=0; tmp > 0; ++i) {
-            digits[numDigits++] = tmp % 10;
-            tmp /= 10;
+        }
+    }
-    int failures = 0;
-    qint64 number;
-    for (number=max; number>=min; --number) {
-        tmp = qAbs(number);
-        for (int i=0; tmp > 0;) {
-            if (digits[i] == (tmp % 10)) {
-                if (++i == numDigits) {
-                    if (match)
-                        *match = number;
-                    QSBDEBUG("returns true 1");
-                    return true;
+                }
+            }
-            tmp /= 10;
+        }
-        if (failures++ == 500000) { //upper bound
-            if (match)
-                *match = num;
-            QSBDEBUG("returns true 2");
-            return true;
+        }
+    }
-    QSBDEBUG("returns false");
-    return false;
+}
 /*! \reimp */

trunk/src/gui/widgets/qspinbox.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/qsplashscreen.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
    \brief The QSplashScreen widget provides a splash screen that can
    be shown during application startup.
-   \ingroup misc
-   \mainclass
    A splash screen is a widget that is usually displayed when an

trunk/src/gui/widgets/qsplashscreen.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/qsplitter.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     Q_D(QSplitterHandle);
     d->s = parent;
-    d->hover = false;
     setOrientation(orientation);
+}
 …
+{
     Q_D(QSplitterHandle);
     if (e->button() == Qt::LeftButton)
+    if (e->button() == Qt::LeftButton) {
         d->mouseOffset = d->pick(e->pos());
+        d->pressed = true;
+        update();
+    }
+}
 …
         d->s->setRubberBand(-1);
         moveSplitter(pos);
+    }
+    if (e->button() == Qt::LeftButton) {
+        d->pressed = false;
+        update();
+    }
+}
 …
     if (d->hover)
         opt.state |= QStyle::State_MouseOver;
+    if (d->pressed)
+        opt.state |= QStyle::State_Sunken;
     if (isEnabled())
         opt.state |= QStyle::State_Enabled;
 …
     */
     bool first = true;
+    bool allInvisible = n != 0;
     for (int i = 0; i < n ; ++i) {
         QSplitterLayoutStruct *s = list.at(i);
+        s->handle->setHidden(first || s->widget->isHidden());
+        if (!s->widget->isHidden())
+        bool widgetHidden = s->widget->isHidden();
+        if (allInvisible && !widgetHidden && !s->collapsed)
+            allInvisible = false;
+        s->handle->setHidden(first || widgetHidden);
+        if (!widgetHidden)
             first = false;
+    }
+    if (allInvisible)
+        for (int i = 0; i < n ; ++i) {
+            QSplitterLayoutStruct *s = list.at(i);
+            if (!s->widget->isHidden()) {
+                s->collapsed = false;
+                break;
+            }
+        }
     int fi = 2 * q->frameWidth();
 …
     if (empty) {
         if (qobject_cast<QSplitter *>(q->parentWidget())) {
+        if (qobject_cast<QSplitter *>(parent)) {
             // nested splitters; be nice
             maxl = maxt = 0;
 …
     \ingroup organizers
+    \mainclass
     A splitter lets the user control the size of child widgets by dragging the
 …
 /*!
     \fn int QSplitter::margin() const
     Returns the with of the the margin around the contents of the widget.
+    Returns the width of the margin around the contents of the widget.
     Use QWidget::getContentsMargins() instead.

trunk/src/gui/widgets/qsplitter.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/qsplitter_p.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     Q_DECLARE_PUBLIC(QSplitterHandle)
 public:
     QSplitterHandlePrivate() : orient(Qt::Horizontal), opaq(false), s(0), mouseOffset(0) {}
+    QSplitterHandlePrivate() : s(0), orient(Qt::Horizontal), mouseOffset(0), opaq(false), hover(false), pressed(false) {}
     inline int pick(const QPoint &pos) const
     { return orient == Qt::Horizontal ? pos.x() : pos.y(); }
+    QSplitter *s;
     Qt::Orientation orient;
-    bool opaq;
-    QSplitter *s;
-    bool hover;
     int mouseOffset;
+    bool opaq    : 1;
+    bool hover   : 1;
+    bool pressed : 1;
 };

trunk/src/gui/widgets/qstackedwidget.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     \ingroup organizers
     \ingroup geomanagement
+    \ingroup appearance
+    \mainclass
     QStackedWidget can be used to create a user interface similar to

trunk/src/gui/widgets/qstackedwidget.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/qstatusbar.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
                         left = qMax(left, item->w->x() + item->w->width() + 2);
                     else
                         right = qMin(right, item->w->x()-1);
+                        right = qMin(right, item->w->x() - 2);
+                }
                 break;
 …
     presenting status information.
     \ingroup application
+    \ingroup mainwindow-classes
     \ingroup helpsystem
+    \mainclass
     Each status indicator falls into one of three categories:
 …
         if (item && item->w->isVisible() && (!haveMessage || item->p)) {
             QRect ir = item->w->geometry().adjusted(-2, -1, 2, 1);
             if (event->rect().contains(ir)) {
+            if (event->rect().intersects(ir)) {
                 QStyleOption opt(0);
                 opt.rect = ir;

trunk/src/gui/widgets/qstatusbar.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/qtabbar.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
         // TODO: test tab bar position
+        // push the black line at the bottom of the menu bar down to the client are so we can paint over it
+        OSWindowRef window = qt_mac_window_for(q);
+        // push base line separator down to the client are so we can paint over it (Carbon)
         metrics.top = (documentMode && q->isVisible()) ? 1 : 0;
         metrics.bottom = 0;
         metrics.left = 0;
         metrics.right = 0;
+        qt_mac_updateContentBorderMetricts(qt_mac_window_for(q), metrics);
+        qt_mac_updateContentBorderMetricts(window, metrics);
+        // hide the base line separator if the tabs have docuemnt mode enabled (Cocoa)
+        qt_mac_showBaseLineSeparator(window, !documentMode);
+    }
 #endif
 …
     if (isActiveWindow())
         option->state |= QStyle::State_Active;
     if (option->rect == d->hoverRect)
+    if (!d->dragInProgress && option->rect == d->hoverRect)
         option->state |= QStyle::State_MouseOver;
     option->shape = d->shape;
 …
             option->cornerWidgets |= QStyleOptionTab::RightCornerWidget;
+    }
+#endif
     QRect textRect = style()->subElementRect(QStyle::SE_TabBarTabText, option, this);
     option->text = fontMetrics().elidedText(option->text, d->elideMode, textRect.width(),
                         Qt::TextShowMnemonic);
-#endif
+}
 …
     \ingroup basicwidgets
+    \mainclass
     QTabBar is straightforward to use; it draws the tabs using one of
 …
+    }
-    if (pressedIndex != -1 && movable)
-        grabCache(0, tabList.count(), true);
     Q_ASSERT(tabChainIndex == tabChain.count() - 1); // add an assert just to make sure.
     // Mirror our front item.
 …
         && movable
         && QApplication::mouseButtons() == Qt::NoButton) {
         _q_moveTabFinished(pressedIndex);
+        moveTabFinished(pressedIndex);
         if (!validIndex(pressedIndex))
             pressedIndex = -1;
 …
 /*!
     Returns the datad of the tab at position \a index, or a null
+    Returns the data of the tab at position \a index, or a null
     variant if \a index is out of range.
 */
 …
 /*!
     Returns the visual rectangle of the of the tab at position \a
+    Returns the visual rectangle of the tab at position \a
     index, or a null rectangle if \a index is out of range.
 */
 …
         update();
         d->makeVisible(index);
+        d->tabList[index].lastTab = oldIndex;
+        d->layoutWidgets(oldIndex);
+        d->layoutWidgets(index);
 #ifdef QT3_SUPPORT
         emit selected(index);
 #endif
         emit currentChanged(index);
-        d->tabList[index].lastTab = oldIndex;
-        d->layoutWidgets(oldIndex);
-        d->layoutWidgets(index);
+    }
+}
 …
 QSize QTabBar::tabSizeHint(int index) const
+{
+    //Note: this must match with the computations in QCommonStylePrivate::tabLayout
     Q_D(const QTabBar);
     if (const QTabBarPrivate::Tab *tab = d->at(index)) {
 …
         int widgetHeight = 0;
         int padding = 0;
         if (opt.leftButtonSize.isValid()) {
             padding += 6 + 2;
+        if (!opt.leftButtonSize.isEmpty()) {
+            padding += 4;
             widgetWidth += opt.leftButtonSize.width();
             widgetHeight += opt.leftButtonSize.height();
+        }
         if (opt.rightButtonSize.isValid()) {
             padding += 6 + 2;
+        if (!opt.rightButtonSize.isEmpty()) {
+            padding += 4;
             widgetWidth += opt.rightButtonSize.width();
             widgetHeight += opt.rightButtonSize.height();
+        }
         if (opt.iconSize.isValid())
             padding += 2;
+        if (!opt.icon.isNull())
+            padding += 4;
         QSize csz;
 …
     QStyleOptionTab cutTab;
     selected = d->currentIndex;
+    if (d->dragInProgress)
+        selected = d->pressedIndex;
     for (int i = 0; i < d->tabList.count(); ++i)
 …
             continue;
+        if (!d->tabList[i].animatingCache.isNull() && d->paintWithOffsets) {
+            p.drawPixmap(tab.rect, d->tabList[i].animatingCache);
+        } else {
+            p.drawControl(QStyle::CE_TabBarTab, tab);
+        }
+        p.drawControl(QStyle::CE_TabBarTab, tab);
+    }
 …
                 tab.rect.moveLeft(tab.rect.x() + d->tabList[selected].dragOffset);
+        }
+        p.drawControl(QStyle::CE_TabBarTab, tab);
+        if (!d->dragInProgress)
+            p.drawControl(QStyle::CE_TabBarTab, tab);
+        else {
+            int taboverlap = style()->pixelMetric(QStyle::PM_TabBarTabOverlap, 0, this);
+            d->movingTab->setGeometry(tab.rect.adjusted(-taboverlap, 0, taboverlap, 0));
+        }
+    }
 …
     int postLocation = vertical ? q->tabRect(to).y() : q->tabRect(to).x();
     int length = postLocation - preLocation;
+    tabList[to].makeTimeLine(q);
+    tabList[to].dragOffset += -1 * length;
+    tabList[to].timeLine->setFrameRange(tabList[to].dragOffset, 0);
+    animations[tabList[to].timeLine] = to;
+    tabList[to].timeLine->setDuration(ANIMATION_DURATION);
+    if (tabList[to].timeLine->state() != QTimeLine::Running)
+        tabList[to].timeLine->start();
+}
+void QTabBarPrivate::_q_moveTab(int offset)
+{
+    Q_Q(QTabBar);
+    if (QTimeLine *timeLine = qobject_cast<QTimeLine *>(q->sender())) {
+        int index = animations[timeLine];
+        if (!validIndex(index))
+            return;
+        tabList[index].dragOffset = offset;
+        q->update();
+    }
+    tabList[to].dragOffset -= length;
+    tabList[to].startAnimation(this, ANIMATION_DURATION);
+}
+void QTabBarPrivate::moveTab(int index, int offset)
+{
+    if (!validIndex(index))
+        return;
+    tabList[index].dragOffset = offset;
+    layoutTab(index); // Make buttons follow tab
+    q_func()->update();
+}
 …
     // Be safe!
     if (d->pressedIndex != -1 && d->movable)
         d->_q_moveTabFinished(d->pressedIndex);
+        d->moveTabFinished(d->pressedIndex);
     d->pressedIndex = d->indexAtPos(event->pos());
+#ifdef Q_WS_MAC
+    d->previousPressedIndex = d->pressedIndex;
+#endif
     if (d->validIndex(d->pressedIndex)) {
         QStyleOptionTabBarBaseV2 optTabBase;
 …
         if (d->pressedIndex != -1
             && event->buttons() == Qt::NoButton)
             d->_q_moveTabFinished(d->pressedIndex);
+            d->moveTabFinished(d->pressedIndex);
         // Start drag
 …
             if ((event->pos() - d->dragStartPosition).manhattanLength() > QApplication::startDragDistance()) {
                 d->dragInProgress = true;
+                if (d->animations.isEmpty())
+                    d->grabCache(0, d->tabList.count(), false);
+                d->setupMovableTab();
+            }
+        }
 …
                         d->slide(i + offset, d->pressedIndex);
+                }
+            }
             // Buttons needs to follow the dragged tab
 …
             update();
+        }
+#ifdef Q_WS_MAC
+    } else if (!d->documentMode && event->buttons() == Qt::LeftButton && d->previousPressedIndex != -1) {
+        int newPressedIndex = d->indexAtPos(event->pos());
+        if (d->pressedIndex == -1 && d->previousPressedIndex == newPressedIndex) {
+            d->pressedIndex = d->previousPressedIndex;
+            update(tabRect(d->pressedIndex));
+        } else if(d->pressedIndex != newPressedIndex) {
+            d->pressedIndex = -1;
+            update(tabRect(d->previousPressedIndex));
+        }
+#endif
+    }
 …
+}
 void QTabBarPrivate::_q_moveTabFinished()
+void QTabBarPrivate::setupMovableTab()
+{
     Q_Q(QTabBar);
+    if (QTimeLine *timeLine = qobject_cast<QTimeLine *>(q->sender())) {
+        int index = animations[timeLine];
+        animations.remove(timeLine);
+        _q_moveTabFinished(index);
+    }
+}
+void QTabBarPrivate::grabCache(int start, int end, bool unhide)
+{
+    Q_Q(QTabBar);
+    paintWithOffsets = false;
+    bool showButtonsAgain = rightB->isVisible();
+    rightB->hide();
+    leftB->hide();
+    QWidget *topLevel = q->window();
+    QPoint topLevelOffset(q->mapTo(topLevel, QPoint()));
+    for (int i = start; i < end; ++i) {
+        QRect tabRect = q->tabRect(i);
+        tabRect.translate(topLevelOffset);
+        if (unhide) {
+            tabList[i].unHideWidgets();
+            layoutWidgets(i);
+        }
+        tabList[i].animatingCache = QPixmap::grabWidget(topLevel, tabRect);
+        if (i != pressedIndex)
+            tabList[i].hideWidgets();
+    }
+    if (showButtonsAgain) {
+        rightB->show();
+        leftB->show();
+    }
+    paintWithOffsets = true;
+}
+void QTabBarPrivate::_q_moveTabFinished(int index)
+    if (!movingTab)
+        movingTab = new QWidget(q);
+    int taboverlap = q->style()->pixelMetric(QStyle::PM_TabBarTabOverlap, 0 ,q);
+    QRect grabRect = q->tabRect(pressedIndex);
+    grabRect.adjust(-taboverlap, 0, taboverlap, 0);
+    QPixmap grabImage(grabRect.size());
+    grabImage.fill(Qt::transparent);
+    QStylePainter p(&grabImage, q);
+    p.initFrom(q);
+    QStyleOptionTabV3 tab;
+    q->initStyleOption(&tab, pressedIndex);
+    tab.rect.moveTopLeft(QPoint(taboverlap, 0));
+    p.drawControl(QStyle::CE_TabBarTab, tab);
+    p.end();
+    QPalette pal;
+    pal.setBrush(QPalette::All, QPalette::Window, grabImage);
+    movingTab->setPalette(pal);
+    movingTab->setGeometry(grabRect);
+    movingTab->setAutoFillBackground(true);
+    movingTab->raise();
+    // Re-arrange widget order to avoid overlaps
+    if (tabList[pressedIndex].leftWidget)
+        tabList[pressedIndex].leftWidget->raise();
+    if (tabList[pressedIndex].rightWidget)
+        tabList[pressedIndex].rightWidget->raise();
+    if (leftB)
+        leftB->raise();
+    if (rightB)
+        rightB->raise();
+    movingTab->setVisible(true);
+}
+void QTabBarPrivate::moveTabFinished(int index)
+{
     Q_Q(QTabBar);
     bool cleanup = (pressedIndex == index) || (pressedIndex == -1) || !validIndex(index);
+    if (animations.isEmpty() && cleanup) {
+    bool allAnimationsFinished = true;
+#ifndef QT_NO_ANIMATION
+    for(int i = 0; allAnimationsFinished && i < tabList.count(); ++i) {
+        const Tab &t = tabList.at(i);
+        if (t.animation && t.animation->state() == QAbstractAnimation::Running)
+            allAnimationsFinished = false;
+    }
+#endif //QT_NO_ANIMATION
+    if (allAnimationsFinished && cleanup) {
+        if(movingTab)
+            movingTab->setVisible(false); // We might not get a mouse release
         for (int i = 0; i < tabList.count(); ++i) {
             tabList[i].dragOffset = 0;
-            tabList[i].unHideWidgets();
-            tabList[i].animatingCache = QPixmap();
+        }
         if (pressedIndex != -1 && movable) {
 …
         return;
+    }
+#ifdef Q_WS_MAC
+    d->previousPressedIndex = -1;
+#endif
     if (d->movable && d->dragInProgress && d->validIndex(d->pressedIndex)) {
         int length = d->tabList[d->pressedIndex].dragOffset;
 …
             : tabRect(d->pressedIndex).width();
         int duration = qMin(ANIMATION_DURATION,
+                ((length < 0 ? (-1 * length) : length) * ANIMATION_DURATION) / width);
+        if (duration > 0) {
+            d->tabList[d->pressedIndex].makeTimeLine(this);
+            d->tabList[d->pressedIndex].timeLine->setFrameRange(length, 0);
+            d->animations[d->tabList[d->pressedIndex].timeLine] = d->pressedIndex;
+            d->tabList[d->pressedIndex].timeLine->setDuration(duration);
+            if (d->tabList[d->pressedIndex].timeLine->state() != QTimeLine::Running)
+                d->tabList[d->pressedIndex].timeLine->start();
+        } else {
+            d->_q_moveTabFinished(d->pressedIndex);
+        }
+                (qAbs(length) * ANIMATION_DURATION) / width);
+        d->tabList[d->pressedIndex].startAnimation(d, duration);
         d->dragInProgress = false;
+        d->movingTab->setVisible(false);
         d->dragStartPosition = QPoint();
+    }
 …
         return;
+    }
+    int dx = event->key() == (isRightToLeft() ? Qt::Key_Right : Qt::Key_Left) ? -1 : 1;
+    for (int index = d->currentIndex + dx; d->validIndex(index); index += dx) {
+        if (d->tabList.at(index).enabled) {
+            setCurrentIndex(index);
+            break;
+        }
+    }
+    int offset = event->key() == (isRightToLeft() ? Qt::Key_Right : Qt::Key_Left) ? -1 : 1;
+    d->setCurrentNextEnabledIndex(offset);
+}
 …
+{
     Q_D(QTabBar);
+    int overIndex = d->indexAtPos(event->pos());
+    if (overIndex != -1) {
+        int offset = event->delta() > 0 ? -1 : 1;
+        setCurrentIndex(currentIndex() + offset);
+    }
+    int offset = event->delta() > 0 ? -1 : 1;
+    d->setCurrentNextEnabledIndex(offset);
     QWidget::wheelEvent(event);
+}
 #endif //QT_NO_WHEELEVENT
+void QTabBarPrivate::setCurrentNextEnabledIndex(int offset)
+{
+    Q_Q(QTabBar);
+    for (int index = currentIndex + offset; validIndex(index); index += offset) {
+        if (tabList.at(index).enabled) {
+            q->setCurrentIndex(index);
+            break;
+        }
+    }
+}
 /*!\reimp
 …
     if (event->type() == QEvent::StyleChange) {
         d->elideMode = Qt::TextElideMode(style()->styleHint(QStyle::SH_TabBar_ElideMode, 0, this));
+        d->useScrollButtons = !style()->styleHint(QStyle::SH_TabBar_PreferNoArrows, 0, this);
+    }
+    d->refresh();
+        if (!d->useScrollButtonsSetByUser)
+            d->useScrollButtons = !style()->styleHint(QStyle::SH_TabBar_PreferNoArrows, 0, this);
+        d->refresh();
+    } else if (event->type() == QEvent::FontChange) {
+        d->refresh();
+    }
     QWidget::changeEvent(event);
+}
 …
+{
     Q_D(QTabBar);
+    d->useScrollButtonsSetByUser = true;
     if (d->useScrollButtons == useButtons)
         return;
 …
         // make sure our left and right widgets stay on top
         widget->lower();
+        widget->show();
+    }
     if (position == LeftSide) {
 …
             d->tabList[index].leftWidget->hide();
         d->tabList[index].leftWidget = widget;
-        if(!d->tabList[index].hidLeft && widget)
-            widget->show();
     } else {
         if (d->tabList[index].rightWidget)
             d->tabList[index].rightWidget->hide();
         d->tabList[index].rightWidget = widget;
-        if(!d->tabList[index].hidRight && widget)
-            widget->show();
+    }
     d->layoutTabs();
+    d->refresh();
     update();
+}

trunk/src/gui/widgets/qtabbar.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     Q_PRIVATE_SLOT(d_func(), void _q_scrollTabs())
     Q_PRIVATE_SLOT(d_func(), void _q_closeTab())
-    Q_PRIVATE_SLOT(d_func(), void _q_moveTab(int))
-    Q_PRIVATE_SLOT(d_func(), void _q_moveTabFinished())
 };

trunk/src/gui/widgets/qtabbar_p.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #include <qicon.h>
 #include <qtoolbutton.h>
-#include <qtimeline.h>
-#include <qhash.h>
 #include <qdebug.h>
+#include <qvariantanimation.h>
 #ifndef QT_NO_TABBAR
 …
 QT_BEGIN_NAMESPACE
 class QTabBarPrivate  : public QWidgetPrivate
 …
 public:
     QTabBarPrivate()
+        :currentIndex(-1), pressedIndex(-1),
+         shape(QTabBar::RoundedNorth),
+         layoutDirty(false), drawBase(true), scrollOffset(0), expanding(true), closeButtonOnTabs(false), selectionBehaviorOnRemove(QTabBar::SelectRightTab), paintWithOffsets(true), movable(false), dragInProgress(false), documentMode(false) {}
+        :currentIndex(-1), pressedIndex(-1), shape(QTabBar::RoundedNorth), layoutDirty(false),
+        drawBase(true), scrollOffset(0), useScrollButtonsSetByUser(false) , expanding(true), closeButtonOnTabs(false),
+        selectionBehaviorOnRemove(QTabBar::SelectRightTab), paintWithOffsets(true), movable(false),
+        dragInProgress(false), documentMode(false), movingTab(0)
+#ifdef Q_WS_MAC
+        , previousPressedIndex(-1)
+#endif
+        {}
     int currentIndex;
 …
     struct Tab {
         inline Tab(const QIcon &ico, const QString &txt)
+            : enabled(true)
+            , shortcutId(0)
+            , text(txt)
+            , icon(ico)
+            , leftWidget(0)
+            , rightWidget(0)
+            , lastTab(-1)
+            , timeLine(0)
+            , dragOffset(0)
+            , hidLeft(false)
+            , hidRight(false)
+            : enabled(true) , shortcutId(0), text(txt), icon(ico),
+            leftWidget(0), rightWidget(0), lastTab(-1), dragOffset(0)
+#ifndef QT_NO_ANIMATION
+            , animation(0)
+#endif //QT_NO_ANIMATION
         {}
+        bool operator==(const Tab &other) const { return &other == this; }
         bool enabled;
         int shortcutId;
 …
         QWidget *rightWidget;
         int lastTab;
-        QTimeLine *timeLine;
         int dragOffset;
+        QPixmap animatingCache;
+        bool hidLeft;
+        bool hidRight;
+        void makeTimeLine(QWidget *q) {
+            if (timeLine)
+                return;
+            timeLine = new QTimeLine(ANIMATION_DURATION, q);
+            q->connect(timeLine, SIGNAL(frameChanged(int)), q, SLOT(_q_moveTab(int)));
+            q->connect(timeLine, SIGNAL(finished()), q, SLOT(_q_moveTabFinished()));
+#ifndef QT_NO_ANIMATION
+        ~Tab() { delete animation; }
+        struct TabBarAnimation : public QVariantAnimation {
+            TabBarAnimation(Tab *t, QTabBarPrivate *_priv) : tab(t), priv(_priv)
+            { setEasingCurve(QEasingCurve::InOutQuad); }
+            void updateCurrentValue(const QVariant &current)
+            { priv->moveTab(priv->tabList.indexOf(*tab), current.toInt()); }
+            void updateState(State, State newState)
+            { if (newState == Stopped) priv->moveTabFinished(priv->tabList.indexOf(*tab)); }
+        private:
+            //these are needed for the callbacks
+            Tab *tab;
+            QTabBarPrivate *priv;
+        } *animation;
+        void startAnimation(QTabBarPrivate *priv, int duration) {
+            if (!animation)
+                animation = new TabBarAnimation(this, priv);
+            animation->setStartValue(dragOffset);
+            animation->setEndValue(0);
+            animation->setDuration(duration);
+            animation->start();
+        }
+        void hideWidgets() {
+            if (!hidRight && rightWidget) {
+                hidRight = rightWidget->isVisible();
+                rightWidget->hide();
+            }
+            if (!hidLeft && leftWidget) {
+                hidLeft = leftWidget->isVisible();
+                leftWidget->hide();
+            }
+        }
+        void unHideWidgets() {
+            if (leftWidget && hidLeft)
+                leftWidget->show();
+            hidLeft = false;
+            if (rightWidget && hidRight)
+                rightWidget->show();
+            hidRight = false;
+        }
+#else
+        void startAnimation(QTabBarPrivate *priv, int duration)
+        { Q_UNUSED(duration); priv->moveTabFinished(priv->tabList.indexOf(*this)); }
+#endif //QT_NO_ANIMATION
     };
     QList<Tab> tabList;
-    QHash<QTimeLine*, int> animations;
     int calculateNewPosition(int from, int to, int index) const;
 …
     inline bool validIndex(int index) const { return index >= 0 && index < tabList.count(); }
+    void setCurrentNextEnabledIndex(int offset);
     QSize minimumTabSizeHint(int index);
 …
     void _q_scrollTabs();
     void _q_closeTab();
+    void _q_moveTab(int);
+    void _q_moveTabFinished();
+    void _q_moveTabFinished(int offset);
+    void moveTab(int index, int offset);
+    void moveTabFinished(int index);
     QRect hoverRect;
-    void grabCache(int start, int end, bool unhide);
     void refresh();
     void layoutTabs();
 …
     void layoutTab(int index);
     void updateMacBorderMetrics();
+    void setupMovableTab();
     void makeVisible(int index);
 …
     Qt::TextElideMode elideMode;
     bool useScrollButtons;
+    bool useScrollButtonsSetByUser;
     bool expanding;
 …
     bool documentMode;
+    QWidget *movingTab;
+#ifdef Q_WS_MAC
+    int previousPressedIndex;
+#endif
     // shared by tabwidget and qtabbar
     static void initStyleBaseOption(QStyleOptionTabBarBaseV2 *optTabBase, QTabBar *tabbar, QSize size)

trunk/src/gui/widgets/qtabwidget.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     \ingroup organizers
     \ingroup basicwidgets
+    \mainclass
     A tab widget provides a tab bar (see QTabBar) and a "page area"
 …
         break;
+    }
     option->tabBarSize = t;
+    if (QStyleOptionTabWidgetFrameV2 *tabframe = qstyleoption_cast<QStyleOptionTabWidgetFrameV2*>(option)) {
+        QRect tbRect = tabBar()->geometry();
+        QRect selectedTabRect = tabBar()->tabRect(tabBar()->currentIndex());
+        tabframe->tabBarRect = tbRect;
+        selectedTabRect.moveTopLeft(selectedTabRect.topLeft() + tbRect.topLeft());
+        tabframe->selectedTabRect = selectedTabRect;
+    }
+}
 …
 /*!
     Returns true if the the page at position \a index is enabled; otherwise returns false.
+    Returns true if the page at position \a index is enabled; otherwise returns false.
     \sa setTabEnabled(), QWidget::isEnabled()
 …
     connect(d->tabs, SIGNAL(currentChanged(int)),
             this, SLOT(_q_showTab(int)));
     connect(d->tabs, SIGNAL(tabMoved(int, int)),
             this, SLOT(_q_tabMoved(int, int)));
+    connect(d->tabs, SIGNAL(tabMoved(int,int)),
+            this, SLOT(_q_tabMoved(int,int)));
     if (d->tabs->tabsClosable())
         connect(d->tabs, SIGNAL(tabCloseRequested(int)),
 …
         return; // nothing to do
     QStyleOptionTabWidgetFrame option;
+    QStyleOptionTabWidgetFrameV2 option;
     initStyleOption(&option);
 …
+            }
+        }
         if (!qApp->focusWidget())
+        if (!QApplication::focusWidget())
             d->tabs->setFocus();
     } else {
 …
+{
     Q_D(QTabWidget);
-    QStylePainter p(this);
     if (documentMode()) {
+        QStylePainter p(this, tabBar());
         if (QWidget *w = cornerWidget(Qt::TopLeftCorner)) {
             QStyleOptionTabBarBaseV2 opt;
 …
         return;
+    }
+    QStyleOptionTabWidgetFrame opt;
+    QStylePainter p(this);
+    QStyleOptionTabWidgetFrameV2 opt;
     initStyleOption(&opt);
     opt.rect = d->panelRect;

trunk/src/gui/widgets/qtabwidget.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/qtextbrowser.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #ifndef QT_NO_CURSOR
     if (q->isVisible())
         qApp->setOverrideCursor(Qt::WaitCursor);
+        QApplication::setOverrideCursor(Qt::WaitCursor);
 #endif
     textOrSourceChanged = true;
 …
         if (q->isVisible()) {
             QString firstTag = txt.left(txt.indexOf(QLatin1Char('>')) + 1);
             if (firstTag.left(3) == QLatin1String("<qt") && firstTag.contains(QLatin1String("type")) && firstTag.contains(QLatin1String("detail"))) {
+            if (firstTag.startsWith(QLatin1String("<qt")) && firstTag.contains(QLatin1String("type")) && firstTag.contains(QLatin1String("detail"))) {
 #ifndef QT_NO_CURSOR
                 qApp->restoreOverrideCursor();
+                QApplication::restoreOverrideCursor();
 #endif
 #ifndef QT_NO_WHATSTHIS
 …
 #ifndef QT_NO_CURSOR
     if (q->isVisible())
         qApp->restoreOverrideCursor();
+        QApplication::restoreOverrideCursor();
 #endif
     emit q->sourceChanged(url);
 …
     \brief The QTextBrowser class provides a rich text browser with hypertext navigation.
     \ingroup text
+    \ingroup richtext-processing
     This class extends QTextEdit (in read-only mode), adding some navigation

trunk/src/gui/widgets/qtextbrowser.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/qtextedit.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #ifndef QT_NO_TEXTEDIT
+static inline bool shouldEnableInputMethod(QTextEdit *textedit)
+{
+    return !textedit->isReadOnly();
+}
 class QTextEditControl : public QTextControl
 …
       autoFormatting(QTextEdit::AutoNone), tabChangesFocus(false),
       lineWrap(QTextEdit::WidgetWidth), lineWrapColumnOrWidth(0),
+      wordWrap(QTextOption::WrapAtWordBoundaryOrAnywhere), textFormat(Qt::AutoText)
+      wordWrap(QTextOption::WrapAtWordBoundaryOrAnywhere), clickCausedFocus(0),
+      textFormat(Qt::AutoText)
+{
     ignoreAutomaticScrollbarAdjustment = false;
 …
     QObject::connect(control, SIGNAL(selectionChanged()), q, SIGNAL(selectionChanged()));
     QObject::connect(control, SIGNAL(cursorPositionChanged()), q, SIGNAL(cursorPositionChanged()));
+    QObject::connect(control, SIGNAL(textChanged()), q, SLOT(updateMicroFocus()));
     QTextDocument *doc = control->document();
 …
 #ifndef QT_NO_CURSOR
     viewport->setCursor(Qt::IBeamCursor);
+#endif
+#ifdef Q_WS_WIN
+    setSingleFingerPanEnabled(true);
 #endif
+}
 …
     both plain and rich text.
     \ingroup text
+    \mainclass
+    \ingroup richtext-processing
     \tableofcontents
 …
     If the text edit has another content type, it will not be replaced
+    by plain text if you call toPlainText().
+    by plain text if you call toPlainText(). The only exception to this
+    is the non-break space, \e{nbsp;}, that will be converted into
+    standard space.
     By default, for an editor with no contents, this property contains
 …
                     if (e->text()[0].isPrint()) {
                         setEditFocus(true);
+#ifndef Q_OS_SYMBIAN
                         clear();
+#endif
                     } else {
                         e->ignore();
 …
+    }
 #endif
+    if (!(d->control->textInteractionFlags() & Qt::TextEditable)) {
+#ifndef QT_NO_SHORTCUT
+    Qt::TextInteractionFlags tif = d->control->textInteractionFlags();
+    if (tif & Qt::TextSelectableByKeyboard){
+        if (e == QKeySequence::SelectPreviousPage) {
+            e->accept();
+            d->pageUpDown(QTextCursor::Up, QTextCursor::KeepAnchor);
+            return;
+        } else if (e ==QKeySequence::SelectNextPage) {
+            e->accept();
+            d->pageUpDown(QTextCursor::Down, QTextCursor::KeepAnchor);
+            return;
+        }
+    }
+    if (tif & (Qt::TextSelectableByKeyboard | Qt::TextEditable)) {
+        if (e == QKeySequence::MoveToPreviousPage) {
+            e->accept();
+            d->pageUpDown(QTextCursor::Up, QTextCursor::MoveAnchor);
+            return;
+        } else if (e == QKeySequence::MoveToNextPage) {
+            e->accept();
+            d->pageUpDown(QTextCursor::Down, QTextCursor::MoveAnchor);
+            return;
+        }
+    }
+    if (!(tif & Qt::TextEditable)) {
         switch (e->key()) {
             case Qt::Key_Space:
 …
+        }
         return;
+    }
-#ifndef QT_NO_SHORTCUT
-    if (e == QKeySequence::MoveToPreviousPage) {
-            e->accept();
-            d->pageUpDown(QTextCursor::Up, QTextCursor::MoveAnchor);
-            return;
-    } else if (e == QKeySequence::MoveToNextPage) {
-            e->accept();
-            d->pageUpDown(QTextCursor::Down, QTextCursor::MoveAnchor);
-            return;
-    } else if (e == QKeySequence::SelectPreviousPage) {
-            e->accept();
-            d->pageUpDown(QTextCursor::Up, QTextCursor::KeepAnchor);
-            return;
-    } else if (e ==QKeySequence::SelectNextPage) {
-            e->accept();
-            d->pageUpDown(QTextCursor::Down, QTextCursor::KeepAnchor);
-            return;
+    }
 #endif // QT_NO_SHORTCUT
 …
         ensureCursorVisible();
+    }
+    if (!isReadOnly() && rect().contains(e->pos()))
+        d->handleSoftwareInputPanel(e->button(), d->clickCausedFocus);
+    d->clickCausedFocus = 0;
+}
 …
         && !hasEditFocus()) {
         setEditFocus(true);
+#ifndef Q_OS_SYMBIAN
         selectAll();    // so text is replaced rather than appended to
+#endif
+    }
 #endif
     d->sendControlEvent(e);
+    ensureCursorVisible();
+}
 …
+{
     Q_D(QTextEdit);
+    if (e->reason() == Qt::MouseFocusReason) {
+        d->clickCausedFocus = 1;
+    }
     QAbstractScrollArea::focusInEvent(e);
     d->sendControlEvent(e);
 …
     \since 4.1
     By default, this property contains a value of 80.
+    By default, this property contains a value of 80 pixels.
 */
 …
         flags = Qt::TextEditorInteraction;
+    }
-    setAttribute(Qt::WA_InputMethodEnabled, !ro);
     d->control->setTextInteractionFlags(flags);
+    setAttribute(Qt::WA_InputMethodEnabled, shouldEnableInputMethod(this));
+}
 …
+}
 /*!
     \enum QTextEdit::KeyboardAction

trunk/src/gui/widgets/qtextedit.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/qtextedit_p.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 class QMimeData;
 class QTextEditPrivate : public QAbstractScrollAreaPrivate
+{
 …
     uint showCursorOnInitialShow : 1;
     uint inDrag : 1;
+    uint clickCausedFocus : 1;
     // Qt3 COMPAT only, for setText

trunk/src/gui/widgets/qtoolbar.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #include  "qdebug.h"
+#define POPUP_TIMER_INTERVAL 500
 QT_BEGIN_NAMESPACE
 …
+{
     Q_Q(QToolBar);
-    waitForPopupTimer = new QTimer(q);
-    waitForPopupTimer->setSingleShot(false);
-    waitForPopupTimer->setInterval(500);
-    QObject::connect(waitForPopupTimer, SIGNAL(timeout()), q, SLOT(_q_waitForPopup()));
-    floatable = true;
-    movable = true;
     q->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed));
     q->setBackgroundRole(QPalette::Button);
 …
     if (visible)
         q->show();
+    if (floating != wasFloating)
+        emit q->topLevelChanged(floating);
+}
 …
         return;
     QMainWindow *win = qobject_cast<QMainWindow*>(q->parentWidget());
+    QMainWindow *win = qobject_cast<QMainWindow*>(parent);
     Q_ASSERT(win != 0);
     QMainWindowLayout *layout = qobject_cast<QMainWindowLayout*>(win->layout());
 …
     state->widgetItem = 0;
     if (q->layoutDirection() == Qt::RightToLeft)
+    if (q->isRightToLeft())
         state->pressPos = QPoint(q->width() - state->pressPos.x(), state->pressPos.y());
+}
 …
         return;
     QMainWindow *win = qobject_cast<QMainWindow*>(q->parentWidget());
+    QMainWindow *win = qobject_cast<QMainWindow*>(parent);
     Q_ASSERT(win != 0);
     QMainWindowLayout *layout = qobject_cast<QMainWindowLayout*>(win->layout());
 …
 bool QToolBarPrivate::mousePressEvent(QMouseEvent *event)
+{
+    if (layout->handleRect().contains(event->pos()) == false) {
+    Q_Q(QToolBar);
+    QStyleOptionToolBar opt;
+    q->initStyleOption(&opt);
+    if (q->style()->subElementRect(QStyle::SE_ToolBarHandle, &opt, q).contains(event->pos()) == false) {
 #ifdef Q_WS_MAC
-        Q_Q(QToolBar);
         // When using the unified toolbar on Mac OS X the user can can click and
         // drag between toolbar contents to move the window. Make this work by
         // implementing the standard mouse-dragging code and then call
         // window->move() in mouseMoveEvent below.
         if (QMainWindow *mainWindow = qobject_cast<QMainWindow *>(q->parentWidget())) {
+        if (QMainWindow *mainWindow = qobject_cast<QMainWindow *>(parent)) {
             if (mainWindow->toolBarArea(q) == Qt::TopToolBarArea
                     && mainWindow->unifiedTitleAndToolBarOnMac()
 …
     } else {
 #ifdef Q_WS_MAC
+        if (!macWindowDragging)
+            return false;
         macWindowDragging = false;
         macWindowDragPressPosition = QPoint();
 …
+    }
     QMainWindow *win = qobject_cast<QMainWindow*>(q->parentWidget());
+    QMainWindow *win = qobject_cast<QMainWindow*>(parent);
     if (win == 0)
         return true;
 …
         // if we are right-to-left, we move so as to keep the right edge the same distance
         // from the mouse
         if (q->layoutDirection() == Qt::LeftToRight)
+        if (q->isLeftToRight())
             pos -= state->pressPos;
         else
 …
         const QPoint rtl(q->width() - state->pressPos.x(), state->pressPos.y()); //for RTL
         const QPoint globalPressPos = q->mapToGlobal(q->layoutDirection() == Qt::RightToLeft ? rtl : state->pressPos);
+        const QPoint globalPressPos = q->mapToGlobal(q->isRightToLeft() ? rtl : state->pressPos);
         int pos = 0;
 …
             pos = q->y() + delta.y();
         } else {
             if (q->layoutDirection() == Qt::RightToLeft) {
+            if (q->isRightToLeft()) {
                 pos = win->width() - q->width() - q->x()  - delta.x();
             } else {
 …
+{
     Q_Q(QToolBar);
     QRect r = _r;
     r.moveTopLeft(q->mapToGlobal(QPoint(0, 0)));
     setWindowState(true, true, r);
+    layout->setExpanded(false);
+}
 …
     set of controls.
     \ingroup application
+    \mainclass
+    \ingroup mainwindow-classes
     Toolbar buttons are added by adding \e actions, using addAction()
 …
     \sa toolButtonStyle QMainWindow::toolButtonStyle
 */
+/*!
+    \since 4.6
+    \fn void QToolBar::topLevelChanged(bool topLevel)
+    This signal is emitted when the \l floating property changes.
+    The \a topLevel parameter is true if the toolbar is now floating;
+    otherwise it is false.
+    \sa isWindow()
+*/
 /*!
 …
     Qt::ToolButtonStyle will not be respected.
     Note: You should use QAction::setVisible() to change the
+    \note You should use QAction::setVisible() to change the
     visibility of the widget. Using QWidget::setVisible(),
     QWidget::show() and QWidget::hide() does not work.
 …
+    }
     opt.rect = d->layout->handleRect();
+    opt.rect = style->subElementRect(QStyle::SE_ToolBarHandle, &opt, this);
     if (opt.rect.isValid())
         style->drawPrimitive(QStyle::PE_IndicatorToolBarHandle, &opt, &p, this);
 …
+}
+#if defined(Q_WS_MAC)
+static bool toolbarInUnifiedToolBar(QToolBar *toolbar)
+{
+    const QMainWindow *mainWindow = qobject_cast<const QMainWindow *>(toolbar->parentWidget());
+    return mainWindow && mainWindow->unifiedTitleAndToolBarOnMac()
+            && mainWindow->toolBarArea(toolbar) == Qt::TopToolBarArea;
+}
+#endif
 /*! \reimp */
 bool QToolBar::event(QEvent *event)
 …
     switch (event->type()) {
+    case QEvent::Timer:
+        if (d->waitForPopupTimer.timerId() == static_cast<QTimerEvent*>(event)->timerId()) {
+            QWidget *w = QApplication::activePopupWidget();
+            if (!waitForPopup(this, w)) {
+                d->waitForPopupTimer.stop();
+                if (!this->underMouse())
+                    d->layout->setExpanded(false);
+            }
+        }
+        break;
     case QEvent::Hide:
         if (!isHidden())
 …
     case QEvent::Show:
         d->toggleViewAction->setChecked(event->type() == QEvent::Show);
+#if defined(Q_WS_MAC) && !defined(QT_MAC_USE_COCOA)
+#if defined(Q_WS_MAC)
+        if (toolbarInUnifiedToolBar(this)) {
+             // I can static_cast because I did the qobject_cast in the if above, therefore
+            // we must have a QMainWindowLayout here.
+            QMainWindowLayout *mwLayout = static_cast<QMainWindowLayout *>(parentWidget()->layout());
+            mwLayout->fixSizeInUnifiedToolbar(this);
+            mwLayout->syncUnifiedToolbarVisibility();
+        }
+#  if !defined(QT_MAC_USE_COCOA)
         // Fall through
     case QEvent::LayoutRequest: {
 …
             if (needUpdate) {
+                OSWindowRef windowRef = qt_mac_window_for(this);
+                if (mainWindow->unifiedTitleAndToolBarOnMac()
+                        && mainWindow->toolBarArea(this) == Qt::TopToolBarArea
+                        && macWindowToolbarVisible(windowRef))   {
+                OSWindowRef windowRef = qt_mac_window_for(mainWindow);
+                if (toolbarInUnifiedToolBar(this)
+                        && macWindowToolbarIsVisible(windowRef))   {
                     DisableScreenUpdates();
                     macWindowToolbarShow(this, false);
 …
+        }
+    }
+#endif
+#  endif // !QT_MAC_USE_COCOA
+#endif // Q_WS_MAC
         break;
     case QEvent::ParentChange:
 …
             return true;
         break;
+    case QEvent::HoverEnter:
+    case QEvent::HoverLeave:
+        // there's nothing special to do here and we don't want to update the whole widget
+        return true;
     case QEvent::HoverMove: {
 #ifndef QT_NO_CURSOR
         QHoverEvent *e = static_cast<QHoverEvent*>(event);
+        if (d->layout->handleRect().contains(e->pos()))
+        QStyleOptionToolBar opt;
+        initStyleOption(&opt);
+        if (style()->subElementRect(QStyle::SE_ToolBarHandle, &opt, this).contains(e->pos()))
             setCursor(Qt::SizeAllCursor);
         else
 …
             return true;
         break;
 #ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
     case QEvent::ContextMenu:
+        {
 …
                 break;
             QWidget *w = qApp->activePopupWidget();
+            QWidget *w = QApplication::activePopupWidget();
             if (waitForPopup(this, w)) {
                 d->waitForPopupTimer->start();
+                d->waitForPopupTimer.start(POPUP_TIMER_INTERVAL, this);
                 break;
+            }
             d->waitForPopupTimer->stop();
+            d->waitForPopupTimer.stop();
             d->layout->setExpanded(false);
             break;
 …
+    }
     return QWidget::event(event);
+}
-void QToolBarPrivate::_q_waitForPopup()
+{
-    Q_Q(QToolBar);
-    QWidget *w = qApp->activePopupWidget();
-    if (!waitForPopup(q, w)) {
-        waitForPopupTimer->stop();
-        if (!q->underMouse())
-            layout->setExpanded(false);
+    }
+}

trunk/src/gui/widgets/qtoolbar.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     void iconSizeChanged(const QSize &iconSize);
     void toolButtonStyleChanged(Qt::ToolButtonStyle toolButtonStyle);
+    void topLevelChanged(bool topLevel);
 protected:
 …
     Q_PRIVATE_SLOT(d_func(), void _q_updateIconSize(const QSize &))
     Q_PRIVATE_SLOT(d_func(), void _q_updateToolButtonStyle(Qt::ToolButtonStyle))
-    Q_PRIVATE_SLOT(d_func(), void _q_waitForPopup())
     friend class QMainWindow;

trunk/src/gui/widgets/qtoolbar_p.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #include "QtGui/qaction.h"
 #include "private/qwidget_p.h"
+#include <QtCore/qbasictimer.h>
 QT_BEGIN_NAMESPACE
 …
 public:
     inline QToolBarPrivate()
         : explicitIconSize(false), explicitToolButtonStyle(false), movable(false),
+        : explicitIconSize(false), explicitToolButtonStyle(false), movable(true), floatable(true),
           allowedAreas(Qt::AllToolBarAreas), orientation(Qt::Horizontal),
           toolButtonStyle(Qt::ToolButtonIconOnly),
 …
     void _q_updateIconSize(const QSize &sz);
     void _q_updateToolButtonStyle(Qt::ToolButtonStyle style);
-    void _q_waitForPopup();
     bool explicitIconSize;
     bool explicitToolButtonStyle;
     bool movable;
+    bool floatable;
     Qt::ToolBarAreas allowedAreas;
     Qt::Orientation orientation;
     Qt::ToolButtonStyle toolButtonStyle;
     QSize iconSize;
-    bool floatable;
     QAction *toggleViewAction;
 …
     void plug(const QRect &r);
     QTimer *waitForPopupTimer;
+    QBasicTimer waitForPopupTimer;
 };

trunk/src/gui/widgets/qtoolbararealayout.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
         QSize sh = item.sizeHint();
         a += pick(o, sh) + item.extraSpace;
+        a += item.preferredSize > 0 ? item.preferredSize : pick(o, sh);
         b = qMax(b, perp(o, sh));
+    }
 …
             continue;
+        QToolBarLayout *tblayout = qobject_cast<QToolBarLayout*>(item.widgetItem->widget()->layout());
+        if (tblayout)
+        if (QToolBarLayout *tblayout = qobject_cast<QToolBarLayout*>(item.widgetItem->widget()->layout()))
             tblayout->checkUsePopupMenu();
         int itemMin = pick(o, item.minimumSize());
         int itemHint = pick(o, item.sizeHint());
         //we ensure the extraspace is not too low
+        item.extraSpace = qMax(itemMin - itemHint, item.extraSpace);
         itemHint  += item.extraSpace;
         int itemExtra = qMin(itemHint - itemMin, extra);
+        item.size = itemMin + itemExtra;
         extra -= itemExtra;
+        const int itemMin = pick(o, item.minimumSize());
+        //preferredSize is the default if it is set, otherwise, we take the sizehint
+        item.size = item.preferredSize > 0 ? item.preferredSize : pick(o, item.sizeHint());
+        //the extraspace is the space above the item minimum sizehint
+        const int extraSpace = qMin(item.size - itemMin, extra);
+        item.size = itemMin + extraSpace; //that is the real size
+        extra -= extraSpace;
         last = i;
 …
 void QToolBarAreaLayoutInfo::moveToolBar(QToolBar *toolbar, int pos)
+{
     if (dirty) {
+    if (dirty)
         fitLayout();
+    }
     dirty = true;
     if (o == Qt::Vertical) {
+    if (o == Qt::Vertical)
         pos -= rect.top();
+    }
+    //here we actually update the extraSpace for the line containing the toolbar so that we move it
+    //here we actually update the preferredSize for the line containing the toolbar so that we move it
     for (int j = 0; j < lines.count(); ++j) {
         QToolBarAreaLayoutLine &line = lines[j];
 …
+                    }
                     //let's update the previous extra space
+                    //extra is the number of pixels to add to the previous toolbar
                     int extra = newPos - current.pos;
+                    if (qAbs(previous.extraSpace + extra) < QApplication::startDragDistance()) {
+                        //we stick to the default space
+                        extra = 0;
+                    //we check if the previous is near its size hint
+                    //in which case we try to stick to it
+                    const int diff = pick(o, previous.sizeHint()) - (previous.size + extra);
+                    if (qAbs(diff) < QApplication::startDragDistance()) {
+                        //we stick to the default place and size
+                        extra += diff;
+                    }
                     //update for the current item
+                    current.extraSpace -= extra;
+                    //this ensures the toolbars to be pushed to the right when necessary
+                    current.extraSpace = qMax(pick(o,current.minimumSize())- pick(o,current.sizeHint()), current.extraSpace);
+                    current.extendSize(line.o, -extra);
                     if (extra >= 0) {
+                        previous.extraSpace += extra;
+                        previous.extendSize(line.o, extra);
                     } else {
                         //we need to push the toolbars on the left starting with previous
 …
                             QToolBarAreaLayoutItem &item = line.toolBarItems[l];
                             if (!item.skip()) {
                                 const int minExtraSpace = pick(o, item.minimumSize()) - pick(o, item.sizeHint());
                                 const int margin =  item.extraSpace - minExtraSpace;
+                                const int minPreferredSize = pick(o, item.minimumSize());
+                                const int margin =  item.size - minPreferredSize;
                                 if (margin < extra) {
                                     item.extraSpace = minExtraSpace;
+                                    item.resize(line.o, minPreferredSize);
                                     extra -= margin;
                                 } else {
                                     item.extraSpace -= extra;
+                                    item.extendSize(line.o, -extra);
                                     extra = 0;
+                                }
 …
 QList<int> QToolBarAreaLayoutInfo::gapIndex(const QPoint &pos) const
+QList<int> QToolBarAreaLayoutInfo::gapIndex(const QPoint &pos, int *minDistance) const
+{
     int p = pick(o, pos);
 …
             QList<int> result;
             result << j << k;
+            *minDistance = 0; //we found a perfect match
             return result;
+        }
+    } else if (appendLineDropRect().contains(pos)) {
+        QList<int> result;
+        result << lines.count() << 0;
+        return result;
+    } else {
+        const int dist = distance(pos);
+        //it will only return a path if the minDistance is higher than the current distance
+        if (dist >= 0 && *minDistance > dist) {
+            *minDistance = dist;
+            QList<int> result;
+            result << lines.count() << 0;
+            return result;
+        }
+    }
 …
+}
+bool QToolBarAreaLayoutInfo::insertGap(QList<int> path, QLayoutItem *item)
+{
+    int j = path.at(0);
+bool QToolBarAreaLayoutInfo::insertGap(const QList<int> &path, QLayoutItem *item)
+{
+    Q_ASSERT(path.count() == 2);
+    int j = path.first();
     if (j == lines.count())
         lines.append(QToolBarAreaLayoutLine(o));
 …
     gap_item.widgetItem = item;
     //update the previous item's extra space
+    //update the previous item's preferred size
     for(int p = k - 1 ; p >= 0; --p) {
         QToolBarAreaLayoutItem &previous = line.toolBarItems[p];
         if (!previous.skip()) {
             //we found the previous one
+            gap_item.extraSpace = qMax(0, previous.extraSpace - pick(o, gap_item.sizeHint()));
+            previous.extraSpace = qMin(previous.extraSpace, 0);
+            int previousSizeHint = pick(line.o, previous.sizeHint());
+            int previousExtraSpace = previous.size - previousSizeHint;
+            if (previousExtraSpace > 0) {
+                //in this case we reset the space
+                previous.preferredSize = -1;
+                previous.size = previousSizeHint;
+                gap_item.resize(o, previousExtraSpace);
+            }
             break;
+        }
 …
+{
     lines.clear();
+    rect = QRect(0, 0, -1, -1);
+}
+QRect QToolBarAreaLayoutInfo::itemRect(QList<int> path) const
+{
+    rect = QRect();
+}
+QRect QToolBarAreaLayoutInfo::itemRect(const QList<int> &path) const
+{
+    Q_ASSERT(path.count() == 2);
     int j = path.at(0);
     int k = path.at(1);
 …
+}
+QRect QToolBarAreaLayoutInfo::appendLineDropRect() const
+{
+    QRect result;
+int QToolBarAreaLayoutInfo::distance(const QPoint &pos) const
+{
     switch (dockPos) {
         case QInternal::LeftDock:
+            result = QRect(rect.right(), rect.top(),
+                            EmptyDockAreaSize, rect.height());
+            break;
+            if (pos.y() < rect.bottom())
+                return pos.x() - rect.right();
         case QInternal::RightDock:
+            result = QRect(rect.left() - EmptyDockAreaSize, rect.top(),
+                            EmptyDockAreaSize, rect.height());
+            break;
+            if (pos.y() < rect.bottom())
+                return rect.left() - pos.x();
         case QInternal::TopDock:
+            result = QRect(rect.left(), rect.bottom() + 1,
+                            rect.width(), EmptyDockAreaSize);
+            break;
+            if (pos.x() < rect.right())
+                return pos.y() - rect.bottom();
         case QInternal::BottomDock:
+            result = QRect(rect.left(), rect.top() - EmptyDockAreaSize,
+                            rect.width(), EmptyDockAreaSize);
+            break;
+            if (pos.x() < rect.right())
+                return rect.top() - pos.y();
         default:
             break;
+    }
+    return result;
+    return -1;
+}
 …
 */
+QToolBarAreaLayout::QToolBarAreaLayout(QMainWindow *win)
+{
+    visible = true;
+    mainWindow = win;
+QToolBarAreaLayout::QToolBarAreaLayout(const QMainWindow *win) : mainWindow(win), visible(true)
+{
     for (int i = 0; i < QInternal::DockCount; ++i) {
         QInternal::DockPosition pos = static_cast<QInternal::DockPosition>(i);
 …
             for (int k = 0; k < line.toolBarItems.count(); ++k) {
                 QToolBarAreaLayoutItem &item = line.toolBarItems[k];
+                delete item.widgetItem;
+                if (!item.gap)
+                    delete item.widgetItem;
                 item.widgetItem = 0;
+            }
 …
                     geo = QStyle::visualRect(dir, line.rect, geo);
                 layout->widgetAnimator->animate(widget, geo, animate);
+                layout->widgetAnimator.animate(widget, geo, animate);
+            }
+        }
 …
+}
+//this functions returns the path to the possible gapindex for the position pos
 QList<int> QToolBarAreaLayout::gapIndex(const QPoint &pos) const
+{
     Qt::LayoutDirection dir = mainWindow->layoutDirection();
+    int minDistance = 80; // when a dock area is empty, how "wide" is it?
+    QList<int> ret; //return value
     for (int i = 0; i < QInternal::DockCount; ++i) {
         QPoint p = pos;
         if (docks[i].o == Qt::Horizontal)
             p = QStyle::visualPos(dir, docks[i].rect, p);
         QList<int> result = docks[i].gapIndex(p);
+        QList<int> result = docks[i].gapIndex(p, &minDistance);
         if (!result.isEmpty()) {
             result.prepend(i);
             return result;
+        }
+    }
     return QList<int>();
+            ret = result;
+        }
+    }
+    return ret;
+}
 …
+}
 bool QToolBarAreaLayout::insertGap(QList<int> path, QLayoutItem *item)
+{
     Q_ASSERT(!path.isEmpty());
     int i = path.takeFirst();
+bool QToolBarAreaLayout::insertGap(const QList<int> &path, QLayoutItem *item)
+{
+    Q_ASSERT(path.count() == 3);
+    const int i = path.first();
     Q_ASSERT(i >= 0 && i < QInternal::DockCount);
+    return docks[i].insertGap(path, item);
+}
+void QToolBarAreaLayout::remove(QList<int> path)
+{
+    return docks[i].insertGap(path.mid(1), item);
+}
+void QToolBarAreaLayout::remove(const QList<int> &path)
+{
+    Q_ASSERT(path.count() == 3);
     docks[path.at(0)].lines[path.at(1)].toolBarItems.removeAt(path.at(2));
+}
 …
     for (int i = 0; i < QInternal::DockCount; ++i)
         docks[i].clear();
     rect = QRect(0, 0, -1, -1);
+}
 QToolBarAreaLayoutItem &QToolBarAreaLayout::item(QList<int> path)
+    rect = QRect();
+}
+QToolBarAreaLayoutItem &QToolBarAreaLayout::item(const QList<int> &path)
+{
     Q_ASSERT(path.count() == 3);
 …
+}
 QRect QToolBarAreaLayout::itemRect(QList<int> path) const
+{
     int i = path.takeFirst();
     QRect r = docks[i].itemRect(path);
+QRect QToolBarAreaLayout::itemRect(const QList<int> &path) const
+{
+    const int i = path.first();
+    QRect r = docks[i].itemRect(path.mid(1));
     if (docks[i].o == Qt::Horizontal)
         r = QStyle::visualRect(mainWindow->layoutDirection(),
 …
+}
 QLayoutItem *QToolBarAreaLayout::plug(QList<int> path)
+QLayoutItem *QToolBarAreaLayout::plug(const QList<int> &path)
+{
     QToolBarAreaLayoutItem &item = this->item(path);
 …
+}
 QLayoutItem *QToolBarAreaLayout::unplug(QList<int> path, QToolBarAreaLayout *other)
+QLayoutItem *QToolBarAreaLayout::unplug(const QList<int> &path, QToolBarAreaLayout *other)
+{
     //other needs to be update as well
+    Q_ASSERT(path.count() == 3);
     QToolBarAreaLayoutItem &item = this->item(path);
 …
     QToolBarAreaLayoutInfo &info = docks[path.at(0)];
     QToolBarAreaLayoutLine &line = info.lines[path.at(1)];
+    if (item.extraSpace != 0) {
+    if (item.size != pick(line.o, item.realSizeHint())) {
+        //the item doesn't have its default size
+        //so we'll give this to the next item
         int newExtraSpace = 0;
+        //let's iterate over the siblings of the current item that pare placed before it
+        //we need to find just the one before
         for (int i = path.at(2) - 1; i >= 0; --i) {
             QToolBarAreaLayoutItem &previous = line.toolBarItems[i];
             if (!previous.skip()) {
+                //we need to check if it has a previous element and a next one
+                //the previous will get its size changed
                 for (int j = path.at(2) + 1; j < line.toolBarItems.count(); ++j) {
                     const QToolBarAreaLayoutItem &next = line.toolBarItems.at(j);
                     if (!next.skip()) {
+                        newExtraSpace = previous.extraSpace = next.pos - previous.pos - pick(line.o, previous.sizeHint());
+                        newExtraSpace = next.pos - previous.pos - pick(line.o, previous.sizeHint());
+                        previous.resize(line.o, next.pos - previous.pos);
+                        break;
+                    }
-                    break;
+                }
                 break;
 …
                 QToolBarAreaLayoutItem &previous = line.toolBarItems[i];
                 if (!previous.skip()) {
                     previous.extraSpace = newExtraSpace;
+                    previous.resize(line.o, pick(line.o, previous.sizeHint()) + newExtraSpace);
                     break;
+                }
 …
+        }
+    }
     Q_ASSERT(!item.gap);
 …
                 stream << shownOrientation;
                 stream << item.pos;
                 //if extraSpace is 0 the item has its "normal" size, so no need to store the size (we store -1)
                 stream << (item.extraSpace == 0 ? -1 : (pick(line.o, item.realSizeHint()) + item.extraSpace));
+                //we store the preferred size. If the use rdidn't resize the toolbars it will be -1
+                stream << item.preferredSize;
                 uint geom0, geom1;
 …
     int lines;
     stream >> lines;
+        if (!testing)
+        testing = mainWindow->unifiedTitleAndToolBarOnMac();
     for (int j = 0; j < lines; ++j) {
 …
         QToolBarAreaLayoutInfo &dock = docks[pos];
+                const bool applyingLayout = !testing && !(pos == QInternal::TopDock && mainWindow->unifiedTitleAndToolBarOnMac());
         QToolBarAreaLayoutLine line(dock.o);
 …
+            }
             if (!testing) {
+            if (applyingLayout) {
                 item.widgetItem = new QWidgetItemV2(toolBar);
                 toolBar->setOrientation(floating ? ((shown & 2) ? Qt::Vertical : Qt::Horizontal) : dock.o);
 …
                 toolBar->d_func()->setWindowState(floating, true, rect);
+                //if it is -1, it means we should use the default size
+                item.extraSpace = (item.size == -1) ? 0 : item.size - pick(line.o, item.realSizeHint());
+                item.preferredSize = item.size;
                 line.toolBarItems.append(item);
+            }
+        }
         if (!testing) {
+        if (applyingLayout) {
             dock.lines.append(line);
+        }

trunk/src/gui/widgets/qtoolbararealayout_p.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 QT_BEGIN_NAMESPACE
+static inline int pick(Qt::Orientation o, const QPoint &pos)
+{ return o == Qt::Horizontal ? pos.x() : pos.y(); }
+static inline int pick(Qt::Orientation o, const QSize &size)
+{ return o == Qt::Horizontal ? size.width() : size.height(); }
+static inline int &rpick(Qt::Orientation o, QPoint &pos)
+{ return o == Qt::Horizontal ? pos.rx() : pos.ry(); }
+static inline int &rpick(Qt::Orientation o, QSize &size)
+{ return o == Qt::Horizontal ? size.rwidth() : size.rheight(); }
+static inline QSizePolicy::Policy pick(Qt::Orientation o, const QSizePolicy &policy)
+{ return o == Qt::Horizontal ? policy.horizontalPolicy() : policy.verticalPolicy(); }
+static inline int perp(Qt::Orientation o, const QPoint &pos)
+{ return o == Qt::Vertical ? pos.x() : pos.y(); }
+static inline int perp(Qt::Orientation o, const QSize &size)
+{ return o == Qt::Vertical ? size.width() : size.height(); }
+static inline int &rperp(Qt::Orientation o, QPoint &pos)
+{ return o == Qt::Vertical ? pos.rx() : pos.ry(); }
+static inline int &rperp(Qt::Orientation o, QSize &size)
+{ return o == Qt::Vertical ? size.rwidth() : size.rheight(); }
 #ifndef QT_NO_TOOLBAR
 …
 public:
     QToolBarAreaLayoutItem(QLayoutItem *item = 0)
         : widgetItem(item), pos(0), size(-1), extraSpace(0), gap(false) {}
+        : widgetItem(item), pos(0), size(-1), preferredSize(-1), gap(false) {}
     bool skip() const;
     QSize minimumSize() const;
     QSize sizeHint() const;
+    QSize realSizeHint() const;
+    QSize realSizeHint() const;
+    void resize(Qt::Orientation o, int newSize)
+    {
+        newSize = qMax(pick(o, minimumSize()), newSize);
+        int sizeh = pick(o, sizeHint());
+        if (newSize == sizeh) {
+            preferredSize = -1;
+            size = sizeh;
+        } else {
+            preferredSize = newSize;
+        }
+    }
+    void extendSize(Qt::Orientation o, int extent)
+    {
+        int newSize = qMax(pick(o, minimumSize()), (preferredSize > 0 ? preferredSize : pick(o, sizeHint())) + extent);
+        int sizeh = pick(o, sizeHint());
+        if (newSize == sizeh) {
+            preferredSize = -1;
+            size = sizeh;
+        } else {
+            preferredSize = newSize;
+        }
+    }
     QLayoutItem *widgetItem;
     int pos;
     int size;
     int extraSpace;
+    int preferredSize;
     bool gap;
 };
 …
+{
 public:
-    enum { EmptyDockAreaSize = 80 }; // when a dock area is empty, how "wide" is it?
     QToolBarAreaLayoutInfo(QInternal::DockPosition pos = QInternal::TopDock);
 …
     void moveToolBar(QToolBar *toolbar, int pos);
     QList<int> gapIndex(const QPoint &pos) const;
     bool insertGap(QList<int> path, QLayoutItem *item);
+    QList<int> gapIndex(const QPoint &pos, int *maxDistance) const;
+    bool insertGap(const QList<int> &path, QLayoutItem *item);
     void clear();
     QRect itemRect(QList<int> path) const;
     QRect appendLineDropRect() const;
+    QRect itemRect(const QList<int> &path) const;
+    int distance(const QPoint &pos) const;
     QRect rect;
 …
     QRect rect;
     QMainWindow *mainWindow;
+    const QMainWindow *mainWindow;
     QToolBarAreaLayoutInfo docks[4];
     bool visible;
     QToolBarAreaLayout(QMainWindow *win);
+    QToolBarAreaLayout(const QMainWindow *win);
     QRect fitLayout();
 …
     QList<int> gapIndex(const QPoint &pos) const;
     QList<int> currentGapIndex() const;
     bool insertGap(QList<int> path, QLayoutItem *item);
     void remove(QList<int> path);
+    bool insertGap(const QList<int> &path, QLayoutItem *item);
+    void remove(const QList<int> &path);
     void remove(QLayoutItem *item);
     void clear();
     QToolBarAreaLayoutItem &item(QList<int> path);
     QRect itemRect(QList<int> path) const;
     QLayoutItem *plug(QList<int> path);
     QLayoutItem *unplug(QList<int> path, QToolBarAreaLayout *other);
+    QToolBarAreaLayoutItem &item(const QList<int> &path);
+    QRect itemRect(const QList<int> &path) const;
+    QLayoutItem *plug(const QList<int> &path);
+    QLayoutItem *unplug(const QList<int> &path, QToolBarAreaLayout *other);
     void saveState(QDataStream &stream) const;

trunk/src/gui/widgets/qtoolbarextension.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 void QToolBarExtension::setOrientation(Qt::Orientation o)
+{
+    QStyleOption opt;
+    opt.init(this);
     if (o == Qt::Horizontal) {
         setIcon(style()->standardIcon(QStyle::SP_ToolBarHorizontalExtensionButton));
+        setIcon(style()->standardIcon(QStyle::SP_ToolBarHorizontalExtensionButton, &opt));
     } else {
         setIcon(style()->standardIcon(QStyle::SP_ToolBarVerticalExtensionButton));
+        setIcon(style()->standardIcon(QStyle::SP_ToolBarVerticalExtensionButton, &opt));
+   }
+}

trunk/src/gui/widgets/qtoolbarextension_p.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #ifndef QT_NO_TOOLBUTTON
 class QToolBarExtension : public QToolButton
+class Q_AUTOTEST_EXPORT QToolBarExtension : public QToolButton
+{
     Q_OBJECT

trunk/src/gui/widgets/qtoolbarlayout.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     if (!set) {
         QObject::connect(extension, SIGNAL(clicked(bool)),
                         this, SLOT(setExpanded(bool)));
+                        this, SLOT(setExpanded(bool)), Qt::UniqueConnection);
         extension->setPopupMode(QToolButton::DelayedPopup);
         extension->setMenu(0);
 …
         if (mw->unifiedTitleAndToolBarOnMac()
                 && mw->toolBarArea(static_cast<QToolBar *>(parentWidget())) == Qt::TopToolBarArea) {
             if (that->expandFlag) {
+            if (expandFlag) {
                 tb->setMaximumSize(0xFFFFFF, 0xFFFFFF);
             } else {
 …
     QStyleOptionToolBar opt;
     tb->initStyleOption(&opt);
-    const int handleExtent = movable()
-            ? style->pixelMetric(QStyle::PM_ToolBarHandleExtent, &opt, tb) : 0;
     const int margin = this->margin();
     const int extensionExtent = style->pixelMetric(QStyle::PM_ToolBarExtensionExtent, &opt, tb);
 …
     QLayout::setGeometry(rect);
-    if (movable()) {
-        if (o == Qt::Horizontal) {
-            handRect = QRect(margin, margin, handleExtent, rect.height() - 2*margin);
-            handRect = QStyle::visualRect(parentWidget()->layoutDirection(), rect, handRect);
-        } else {
-            handRect = QRect(margin, margin, rect.width() - 2*margin, handleExtent);
+        }
-    } else {
-        handRect = QRect();
+    }
     bool ranOutOfSpace = false;
 …
         return;
     if (QMainWindow *win = qobject_cast<QMainWindow*>(tb->parentWidget())) {
         animating = true;
+        animating = !tb->isWindow() && win->isAnimated();
         QMainWindowLayout *layout = qobject_cast<QMainWindowLayout*>(win->layout());
         if (expanded) {
 …
+            }
+        }
         layout->layoutState.toolBarAreaLayout.apply(true);
+        layout->layoutState.toolBarAreaLayout.apply(animating);
+    }
+}
 …
+}
-QRect QToolBarLayout::handleRect() const
+{
-    return handRect;
+}
 QT_END_NAMESPACE

trunk/src/gui/widgets/qtoolbarlayout_p.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 class QMenu;
 class Q_GUI_EXPORT QToolBarItem : public QWidgetItem
+class QToolBarItem : public QWidgetItem
+{
 public:
 …
 };
 class Q_GUI_EXPORT QToolBarLayout : public QLayout
+class QToolBarLayout : public QLayout
+{
     Q_OBJECT
 …
     int indexOf(QWidget *widget) const { return QLayout::indexOf(widget); }
-    QRect handleRect() const;
     bool layoutActions(const QSize &size);
     QSize expandedSize(const QSize &size) const;
 …
     bool hasExpandFlag() const;
 public slots:
+public Q_SLOTS:
     void setExpanded(bool b);

trunk/src/gui/widgets/qtoolbarseparator.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/qtoolbarseparator_p.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/qtoolbox.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     \brief The QToolBox class provides a column of tabbed widget items.
+    \mainclass
     \ingroup basicwidgets
 …
 /*!
     \fn int QToolBox::margin() const
     Returns the with of the the margin around the contents of the widget.
+    Returns the width of the margin around the contents of the widget.
     Use QWidget::getContentsMargins() instead.

trunk/src/gui/widgets/qtoolbox.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/qtoolbutton.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 bool QToolButtonPrivate::hasMenu() const
+{
-    Q_Q(const QToolButton);
     return ((defaultAction && defaultAction->menu())
             || (menuAction && menuAction->menu())
             || q->actions().size() > (defaultAction ? 1 : 0));
+            || actions.size() > (defaultAction ? 1 : 0));
+}
 #endif
 …
     \ingroup basicwidgets
+    \mainclass
     A tool button is a special button that provides quick-access to
 …
     defaultAction = 0;
 #ifndef QT_NO_TOOLBAR
     if (qobject_cast<QToolBar*>(q->parentWidget()))
+    if (qobject_cast<QToolBar*>(parent))
         autoRaise = true;
     else
 …
         option->features |= QStyleOptionToolButton::HasMenu;
 #endif
+    option->toolButtonStyle = d->toolButtonStyle;
+    if (d->toolButtonStyle == Qt::ToolButtonFollowStyle) {
+        option->toolButtonStyle = Qt::ToolButtonStyle(style()->styleHint(QStyle::SH_ToolButtonStyle, option, this));
+    } else
+        option->toolButtonStyle = d->toolButtonStyle;
+    if (option->toolButtonStyle == Qt::ToolButtonTextBesideIcon) {
+        // If the action is not prioritized, remove the text label to save space
+        if (d->defaultAction && d->defaultAction->priority() < QAction::NormalPriority)
+            option->toolButtonStyle = Qt::ToolButtonIconOnly;
+    }
     if (d->icon.isNull() && d->arrowType == Qt::NoArrow && !forceNoText) {
         if (!d->text.isEmpty())
 …
     The default is Qt::ToolButtonIconOnly.
+    To have the style of toolbuttons follow the system settings (as available
+    in GNOME and KDE desktop environments), set this property to Qt::ToolButtonFollowStyle.
     QToolButton automatically connects this slot to the relevant
     signal in the QMainWindow in which is resides.
 …
     if (!hasMenu())
         return; // no menu to show
+    if (delay > 0 && popupMode == QToolButton::DelayedPopup)
+    if (popupMode == QToolButton::MenuButtonPopup)
+        return;
+    else if (delay > 0 && !popupTimer.isActive() && popupMode == QToolButton::DelayedPopup)
         popupTimer.start(delay, q);
     else if (delay == 0 || popupMode == QToolButton::InstantPopup)
 …
         actualMenu = new QMenu(q);
         mustDeleteActualMenu = true;
-        QList<QAction*> actions = q->actions();
         for(int i = 0; i < actions.size(); i++)
             actualMenu->addAction(actions.at(i));
 …
     bool horizontal = true;
 #if !defined(QT_NO_TOOLBAR)
     QToolBar *tb = qobject_cast<QToolBar*>(q->parentWidget());
+    QToolBar *tb = qobject_cast<QToolBar*>(parent);
     if (tb && tb->orientation() == Qt::Vertical)
         horizontal = false;
 #endif
     QPoint p;
     QRect screen = qApp->desktop()->availableGeometry(q);
+    QRect screen = QApplication::desktop()->availableGeometry(q);
     QSize sh = ((QToolButton*)(QMenu*)actualMenu)->receivers(SIGNAL(aboutToShow()))? QSize() : actualMenu->sizeHint();
     QRect rect = q->rect();

trunk/src/gui/widgets/qtoolbutton.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/qvalidator.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     \class QValidator
     \brief The QValidator class provides validation of input text.
-    \ingroup misc
-    \mainclass
     The class itself is abstract. Two subclasses, \l QIntValidator and
 …
     \i For an editable combobox that accepts URLs, any well-formed URL
     is \l Acceptable, "http://qtsoftware.com/," is \l Intermediate
+    is \l Acceptable, "http://example.com/," is \l Intermediate
     (it might be a cut and paste action that accidentally took in a
     comma at the end), the empty string is \l Intermediate (the user
 …
     \i For a spin box that accepts lengths, "11cm" and "1in" are \l
     Acceptable, "11" and the empty string are \l Intermediate, and
     "http://qtsoftware.com" and "hour" are \l Invalid.
+    "http://example.com" and "hour" are \l Invalid.
     \endlist
 …
     a string contains a valid integer within a specified range.
-    \ingroup misc
     Example of use:
 …
         return 1;
     return (int)log10(double(n)) + 1;
 };
+}
 static qlonglong pow10(int exp)
 …
     \brief The QDoubleValidator class provides range checking of
     floating-point numbers.
-    \ingroup misc
     QDoubleValidator provides an upper bound, a lower bound, and a
 …
             numMode = QLocalePrivate::DoubleScientificMode;
             break;
     };
+    }
     QByteArray buff;
 …
     \brief The QRegExpValidator class is used to check a string
     against a regular expression.
-    \ingroup misc
     QRegExpValidator uses a regular expression (regexp) to

trunk/src/gui/widgets/qvalidator.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
     Q_OBJECT
 public:
     explicit QValidator(QObject * parent);
+    explicit QValidator(QObject * parent = 0);
     ~QValidator();
 …
 public:
     explicit QIntValidator(QObject * parent);
+    explicit QIntValidator(QObject * parent = 0);
     QIntValidator(int bottom, int top, QObject * parent);
     ~QIntValidator();

trunk/src/gui/widgets/qwidgetanimator.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+#include <QtCore/qtimer.h>
+#include <QtCore/qdatetime.h>
+#include <QtCore/qpropertyanimation.h>
 #include <QtGui/qwidget.h>
+#include <QtGui/qtextedit.h>
+#include <QtGui/private/qwidget_p.h>
+#include <qdebug.h>
+#include <QtGui/private/qmainwindowlayout_p.h>
 #include "qwidgetanimator_p.h"
 …
 QT_BEGIN_NAMESPACE
+static const int g_animation_steps = 12;
+static const int g_animation_interval = 16;
+// 1000 * (x/(1 + x*x) + 0.5) on interval [-1, 1]
+static const int g_animate_function[] =
+QWidgetAnimator::QWidgetAnimator(QMainWindowLayout *layout) : m_mainWindowLayout(layout)
+{
-, 1, 5, 12, 23, 38, 58, 84, 116, 155, 199, 251, 307, 368,
-, 500, 566, 631, 692, 748, 799, 844, 883, 915, 941, 961,
-, 987, 994, 998, 1000
-};
-static const int g_animate_function_points = sizeof(g_animate_function)/sizeof(int);
-static inline int animateHelper(int start, int stop, int step, int steps)
+{
-    if (start == stop)
-        return start;
-    if (step == 0)
-        return start;
-    if (step == steps)
-        return stop;
-    int x = g_animate_function_points*step/(steps + 1);
-    return start + g_animate_function[x]*(stop - start)/1000;
+}
-QWidgetAnimator::QWidgetAnimator(QObject *parent)
-    : QObject(parent)
+{
-    m_time = new QTime();
-    m_timer = new QTimer(this);
-    m_timer->setInterval(g_animation_interval);
-    connect(m_timer, SIGNAL(timeout()), this, SLOT(animationStep()));
+}
-QWidgetAnimator::~QWidgetAnimator()
+{
-    delete m_time;
+}
 void QWidgetAnimator::abort(QWidget *w)
+{
+    if (m_animation_map.remove(w) == 0)
+#ifndef QT_NO_ANIMATION
+    AnimationMap::iterator it = m_animation_map.find(w);
+    if (it == m_animation_map.end())
         return;
+    if (m_animation_map.isEmpty()) {
+        m_timer->stop();
+        emit finishedAll();
+    }
+    QPropertyAnimation *anim = *it;
+    m_animation_map.erase(it);
+    anim->stop();
+#ifndef QT_NO_MAINWINDOW
+    m_mainWindowLayout->animationFinished(w);
+#endif
+#else
+    Q_UNUSED(w); //there is no animation to abort
+#endif //QT_NO_ANIMATION
+}
+#ifndef QT_NO_ANIMATION
+void QWidgetAnimator::animationFinished()
+{
+    QPropertyAnimation *anim = qobject_cast<QPropertyAnimation*>(sender());
+    abort(static_cast<QWidget*>(anim->targetObject()));
+}
+#endif //QT_NO_ANIMATION
 void QWidgetAnimator::animate(QWidget *widget, const QRect &_final_geometry, bool animate)
+{
-    QRect final_geometry = _final_geometry;
     QRect r = widget->geometry();
     if (r.right() < 0 || r.bottom() < 0)
         r = QRect();
+    if (r.isNull() || final_geometry.isNull())
+        animate = false;
+    animate = animate && !r.isNull() && !_final_geometry.isNull();
+    // might make the wigdet go away by sending it to negative space
+    const QRect final_geometry = _final_geometry.isValid() || widget->isWindow() ? _final_geometry :
+        QRect(QPoint(-500 - widget->width(), -500 - widget->height()), widget->size());
+#ifndef QT_NO_ANIMATION
     AnimationMap::const_iterator it = m_animation_map.constFind(widget);
+    if (it == m_animation_map.constEnd()) {
+        if (r == final_geometry) {
+            emit finished(widget);
+            return;
+        }
+    } else {
+        if ((*it).r2 == final_geometry)
+            return;
+    }
+    if (it != m_animation_map.constEnd() && (*it)->endValue().toRect() == final_geometry)
+        return;
+    if (animate) {
+        AnimationItem item(widget, r, final_geometry);
+        m_animation_map[widget] = item;
+        if (!m_timer->isActive()) {
+            m_timer->start();
+            m_time->start();
+        }
+    } else {
+        m_animation_map.remove(widget);
+        if (m_animation_map.isEmpty())
+            m_timer->stop();
+        if (!final_geometry.isValid() && !widget->isWindow()) {
+            // Make the wigdet go away by sending it to negative space
+            QSize s = widget->size();
+            final_geometry = QRect(-500 - s.width(), -500 - s.height(), s.width(), s.height());
+        }
+        widget->setGeometry(final_geometry);
+        emit finished(widget);
+        if (m_animation_map.isEmpty())
+            emit finishedAll();
+        return;
+    }
+}
+void QWidgetAnimator::animationStep()
+{
+    int steps = (1 + m_time->restart())/g_animation_interval;
+    AnimationMap::iterator it = m_animation_map.begin();
+    while (it != m_animation_map.end()) {
+        AnimationItem &item = *it;
+        item.step = qMin(item.step + steps, g_animation_steps);
+        int x = animateHelper(item.r1.left(), item.r2.left(),
+                            item.step, g_animation_steps);
+        int y = animateHelper(item.r1.top(), item.r2.top(),
+                            item.step, g_animation_steps);
+        int w = animateHelper(item.r1.width(), item.r2.width(),
+                            item.step, g_animation_steps);
+        int h = animateHelper(item.r1.height(), item.r2.height(),
+                            item.step, g_animation_steps);
+        item.widget->setGeometry(x, y, w, h);
+        if (item.step == g_animation_steps) {
+            emit finished(item.widget);
+            AnimationMap::iterator tmp = it;
+            ++it;
+            m_animation_map.erase(tmp);
+        } else {
+            ++it;
+        }
+    }
+    if (m_animation_map.isEmpty()) {
+        m_timer->stop();
+        emit finishedAll();
+    }
+    QPropertyAnimation *anim = new QPropertyAnimation(widget, "geometry", widget);
+    anim->setDuration(animate ? 200 : 0);
+    anim->setEasingCurve(QEasingCurve::InOutQuad);
+    anim->setEndValue(final_geometry);
+    m_animation_map[widget] = anim;
+    connect(anim, SIGNAL(finished()), SLOT(animationFinished()));
+    anim->start(QPropertyAnimation::DeleteWhenStopped);
+#else
+    //we do it in one shot
+    widget->setGeometry(final_geometry);
+#ifndef QT_NO_MAINWINDOW
+    m_mainWindowLayout->animationFinished(widget);
+#endif //QT_NO_MAINWINDOW
+#endif //QT_NO_ANIMATION
+}
 bool QWidgetAnimator::animating() const
+{
+    return m_timer->isActive();
+}
+bool QWidgetAnimator::animating(QWidget *widget)
+{
+    return m_animation_map.contains(widget);
+    return !m_animation_map.isEmpty();
+}

trunk/src/gui/widgets/qwidgetanimator_p.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #include <qobject.h>
-#include <qrect.h>
 #include <qmap.h>
 …
 class QWidget;
+class QTimer;
+class QTime;
+class QMainWindowLayout;
+class QPropertyAnimation;
+class QRect;
 class QWidgetAnimator : public QObject
 …
     Q_OBJECT
 public:
+    QWidgetAnimator(QObject *parent = 0);
+    ~QWidgetAnimator();
+    QWidgetAnimator(QMainWindowLayout *layout);
     void animate(QWidget *widget, const QRect &final_geometry, bool animate);
     bool animating() const;
-    bool animating(QWidget *widget);
     void abort(QWidget *widget);
+signals:
+    void finished(QWidget *widget);
+    void finishedAll();
+private slots:
+    void animationStep();
+#ifndef QT_NO_ANIMATION
+private Q_SLOTS:
+    void animationFinished();
+#endif
 private:
+    struct AnimationItem {
+        AnimationItem(QWidget *_widget = 0, const QRect &_r1 = QRect(),
+                        const QRect &_r2 = QRect())
+            : widget(_widget), r1(_r1), r2(_r2), step(0) {}
+        QWidget *widget;
+        QRect r1, r2;
+        int step;
+    };
+    typedef QMap<QWidget*, AnimationItem> AnimationMap;
+    typedef QMap<QWidget*, QPropertyAnimation*> AnimationMap;
     AnimationMap m_animation_map;
+    QTimer *m_timer;
+    QTime *m_time;
+    QMainWindowLayout *m_mainWindowLayout;
 };

trunk/src/gui/widgets/qwidgetresizehandler.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
 #ifdef Q_WS_X11
     // Workaround for window managers which refuse to move a tool window partially offscreen.
     QRect desktop = qApp->desktop()->availableGeometry(widget);
+    QRect desktop = QApplication::desktop()->availableGeometry(widget);
     pp.rx() = qMax(pp.x(), desktop.left());
     pp.ry() = qMax(pp.y(), desktop.top());

trunk/src/gui/widgets/qwidgetresizehandler_p.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/qworkspace.cpp

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 …
                                                                  helpEvent->pos(), this);
         if (ctrl == QStyle::SC_MdiCloseButton)
             QToolTip::showText(helpEvent->globalPos(), QWorkspace::tr("Close"));
+            QToolTip::showText(helpEvent->globalPos(), QWorkspace::tr("Close"), this);
         else if (ctrl == QStyle::SC_MdiMinButton)
             QToolTip::showText(helpEvent->globalPos(), QWorkspace::tr("Minimize"));
+            QToolTip::showText(helpEvent->globalPos(), QWorkspace::tr("Minimize"), this);
         else if (ctrl == QStyle::SC_MdiNormalButton)
             QToolTip::showText(helpEvent->globalPos(), QWorkspace::tr("Restore Down"));
+            QToolTip::showText(helpEvent->globalPos(), QWorkspace::tr("Restore Down"), this);
         else
             QToolTip::hideText();
 …
         pal.setColor(QPalette::Active, QPalette::HighlightedText, colorref2qrgb(GetSysColor(COLOR_CAPTIONTEXT)));
         pal.setColor(QPalette::Inactive, QPalette::HighlightedText, colorref2qrgb(GetSysColor(COLOR_INACTIVECAPTIONTEXT)));
+        if (QSysInfo::WindowsVersion != QSysInfo::WV_95 && QSysInfo::WindowsVersion != QSysInfo::WV_NT) {
+            colorsInitialized = true;
+            BOOL gradient;
+            QT_WA({
+                SystemParametersInfo(SPI_GETGRADIENTCAPTIONS, 0, &gradient, 0);
+            } , {
+                SystemParametersInfoA(SPI_GETGRADIENTCAPTIONS, 0, &gradient, 0);
+            });
+            if (gradient) {
+                pal.setColor(QPalette::Active, QPalette::Base, colorref2qrgb(GetSysColor(COLOR_GRADIENTACTIVECAPTION)));
+                pal.setColor(QPalette::Inactive, QPalette::Base, colorref2qrgb(GetSysColor(COLOR_GRADIENTINACTIVECAPTION)));
+            } else {
+                pal.setColor(QPalette::Active, QPalette::Base, pal.color(QPalette::Active, QPalette::Highlight));
+                pal.setColor(QPalette::Inactive, QPalette::Base, pal.color(QPalette::Inactive, QPalette::Highlight));
+            }
+        colorsInitialized = true;
+        BOOL gradient = false;
+        SystemParametersInfo(SPI_GETGRADIENTCAPTIONS, 0, &gradient, 0);
+        if (gradient) {
+            pal.setColor(QPalette::Active, QPalette::Base, colorref2qrgb(GetSysColor(COLOR_GRADIENTACTIVECAPTION)));
+            pal.setColor(QPalette::Inactive, QPalette::Base, colorref2qrgb(GetSysColor(COLOR_GRADIENTINACTIVECAPTION)));
+        } else {
+            pal.setColor(QPalette::Active, QPalette::Base, pal.color(QPalette::Active, QPalette::Highlight));
+            pal.setColor(QPalette::Inactive, QPalette::Base, pal.color(QPalette::Inactive, QPalette::Highlight));
+        }
+    }
 …
     \brief The QWorkspace widget provides a workspace window that can be
     used in an MDI application.
-    \ingroup application
     This class is deprecated. Use QMdiArea instead.

trunk/src/gui/widgets/qworkspace.h

-              r2
+              r561
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 …
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
 …
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
 ** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **

trunk/src/gui/widgets/widgets.pri

-              r2
+              r561
         widgets/qlineedit.h \
         widgets/qlineedit_p.h \
+        widgets/qlinecontrol_p.h \
         widgets/qmainwindow.h \
         widgets/qmainwindowlayout_p.h \
 …
         widgets/qmdisubwindow_p.h \
         widgets/qmenu.h \
+        widgets/qmenu_p.h \
         widgets/qmenubar.h \
+        widgets/qmenubar_p.h \
         widgets/qmenudata.h \
         widgets/qprogressbar.h \
 …
         widgets/qplaintextedit_p.h \
         widgets/qprintpreviewwidget.h
 SOURCES += \
         widgets/qabstractbutton.cpp \
 …
         widgets/qlabel.cpp \
         widgets/qlcdnumber.cpp \
+        widgets/qlineedit_p.cpp \
         widgets/qlineedit.cpp \
+        widgets/qlinecontrol.cpp \
         widgets/qmainwindow.cpp \
         widgets/qmainwindowlayout.cpp \
 …
         widgets/qprintpreviewwidget.cpp
 !embedded:mac {
     HEADERS += widgets/qmacnativewidget_mac.h \
 …
     !static: QMAKE_WRITE_DEFAULT_RC = 1
+}
+symbian*: {
+    SOURCES += widgets/qmenu_symbian.cpp
+}

/branches/vendor/nokia/qt/4.6.1	merged	eligible
/branches/vendor/nokia/qt/current	merged	eligible
/branches/vendor/trolltech/qt/current	3-149

Context Navigation

Legend: