Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui

3 files changed, 42 insertions, 8 deletions

diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp
index 1226722..961f44f 100644
--- a/src/gui/graphicsview/qgraphicsscene.cpp
+++ b/src/gui/graphicsview/qgraphicsscene.cpp
@@ -254,6 +254,8 @@
 
 QT_BEGIN_NAMESPACE
 
+bool qt_sendSpontaneousEvent(QObject *receiver, QEvent *event);
+
 static void _q_hoverFromMouseEvent(QGraphicsSceneHoverEvent *hover, const QGraphicsSceneMouseEvent *mouseEvent)
 {
     hover->setWidget(mouseEvent->widget());
@@ -1051,7 +1053,15 @@ bool QGraphicsScenePrivate::sendEvent(QGraphicsItem *item, QEvent *event)
         return false;
     if (filterDescendantEvent(item, event))
         return false;
-    return (item && item->isEnabled() ? item->sceneEvent(event) : false);
+    if (!item || !item->isEnabled())
+        return false;
+    if (QGraphicsObject *o = item->toGraphicsObject()) {
+        bool spont = event->spontaneous();
+        if (spont ? qt_sendSpontaneousEvent(o, event) : QApplication::sendEvent(o, event))
+            return true;
+        event->spont = spont;
+    }
+    return item->sceneEvent(event);
 }
 
 /*!
diff --git a/src/gui/graphicsview/qgraphicswidget.cpp b/src/gui/graphicsview/qgraphicswidget.cpp
index 224f50b..35a3c13 100644
--- a/src/gui/graphicsview/qgraphicswidget.cpp
+++ b/src/gui/graphicsview/qgraphicswidget.cpp
@@ -168,8 +168,6 @@ QT_BEGIN_NAMESPACE
     \sa QGraphicsProxyWidget, QGraphicsItem, {Widgets and Layouts}
 */
 
-bool qt_sendSpontaneousEvent(QObject *receiver, QEvent *event);
-
 /*!
     Constructs a QGraphicsWidget instance. The optional \a parent argument is
     passed to QGraphicsItem's constructor. The optional \a wFlags argument
@@ -349,7 +347,7 @@ void QGraphicsWidget::setGeometry(const QRectF &rect)
 
         // setPos triggers ItemPositionChange, which can adjust position
         wd->inSetGeometry = 1;
-        wd->setPosHelper(newGeom.topLeft());
+        setPos(newGeom.topLeft());
         wd->inSetGeometry = 0;
         newGeom.moveTopLeft(pos());
 
@@ -1103,10 +1101,6 @@ QVariant QGraphicsWidget::propertyChange(const QString &propertyName, const QVar
 */
 bool QGraphicsWidget::sceneEvent(QEvent *event)
 {
-    bool spont = event->spontaneous();
-    if (spont ? qt_sendSpontaneousEvent(this, event) : QApplication::sendEvent(this, event))
-        return true;
-    event->spont = spont;
     return QGraphicsItem::sceneEvent(event);
 }
 
diff --git a/src/gui/graphicsview/qsimplex_p.cpp b/src/gui/graphicsview/qsimplex_p.cpp
index 1ece8b1..00fc204 100644
--- a/src/gui/graphicsview/qsimplex_p.cpp
+++ b/src/gui/graphicsview/qsimplex_p.cpp
@@ -75,15 +75,24 @@ QT_BEGIN_NAMESPACE
   3.c) Run simplex to optimize the original problem towards its optimal solution.
 */
 
+/*!
+  \internal
+*/
 QSimplex::QSimplex() : objective(0), rows(0), columns(0), firstArtificial(0), matrix(0)
 {
 }
 
+/*!
+  \internal
+*/
 QSimplex::~QSimplex()
 {
     clearDataStructures();
 }
 
+/*!
+  \internal
+*/
 void QSimplex::clearDataStructures()
 {
     if (matrix == 0)
@@ -312,11 +321,17 @@ void QSimplex::solveMaxHelper()
     while (iterate()) ;
 }
 
+/*!
+  \internal
+*/
 void QSimplex::setObjective(QSimplexConstraint *newObjective)
 {
     objective = newObjective;
 }
 
+/*!
+  \internal
+*/
 void QSimplex::clearRow(int rowIndex)
 {
     qreal *item = matrix + rowIndex * columns;
@@ -324,6 +339,9 @@ void QSimplex::clearRow(int rowIndex)
         item[i] = 0.0;
 }
 
+/*!
+  \internal
+*/
 void QSimplex::clearColumns(int first, int last)
 {
     for (int i = 0; i < rows; ++i) {
@@ -333,6 +351,9 @@ void QSimplex::clearColumns(int first, int last)
     }
 }
 
+/*!
+  \internal
+*/
 void QSimplex::dumpMatrix()
 {
     qDebug("---- Simplex Matrix ----\n");
@@ -352,6 +373,9 @@ void QSimplex::dumpMatrix()
     qDebug("------------------------\n");
 }
 
+/*!
+  \internal
+*/
 void QSimplex::combineRows(int toIndex, int fromIndex, qreal factor)
 {
     if (!factor)
@@ -375,6 +399,9 @@ void QSimplex::combineRows(int toIndex, int fromIndex, qreal factor)
     }
 }
 
+/*!
+  \internal
+*/
 int QSimplex::findPivotColumn()
 {
     qreal min = 0;
@@ -429,6 +456,9 @@ int QSimplex::pivotRowForColumn(int column)
     return minIndex;
 }
 
+/*!
+  \internal
+*/
 void QSimplex::reducedRowEchelon()
 {
     for (int i = 1; i < rows; ++i) {