Merge commit 'qt/master-stable'

Conflicts:
	configure.exe
	qmake/Makefile.unix
	qmake/generators/makefile.cpp
	src/corelib/global/qglobal.h
	src/corelib/kernel/kernel.pri
	src/corelib/kernel/qcoreevent.cpp
	src/corelib/kernel/qsharedmemory_unix.cpp
	src/gui/graphicsview/qgraphicsscene.cpp
	src/gui/kernel/qaction.cpp
	src/gui/kernel/qaction.h
	src/gui/kernel/qaction_p.h
	src/gui/kernel/qapplication.cpp
	src/gui/kernel/qapplication.h
	src/gui/kernel/qwidget.cpp
	src/gui/kernel/qwidget.h
	src/gui/kernel/qwidget_mac.mm
	src/gui/painting/qgraphicssystemfactory.cpp
	src/gui/styles/qwindowsstyle.cpp
	src/gui/text/qfontengine_qpf.cpp
	src/gui/widgets/qabstractscrollarea_p.h
	src/network/access/qnetworkaccessdebugpipebackend.cpp
	src/network/socket/qlocalsocket_unix.cpp
	src/network/socket/qnativesocketengine_p.h
	src/network/socket/qnativesocketengine_unix.cpp
	src/openvg/qpaintengine_vg.cpp
	tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
	tests/auto/qcssparser/qcssparser.pro
	tests/auto/qdir/tst_qdir.cpp
	tests/auto/qfile/tst_qfile.cpp
	tests/auto/qobject/tst_qobject.cpp
	tests/auto/qpathclipper/qpathclipper.pro
	tests/auto/qprocess/tst_qprocess.cpp
	tests/auto/qsettings/tst_qsettings.cpp
	tests/auto/qsharedpointer/qsharedpointer.pro
	tests/auto/qsqlquerymodel/qsqlquerymodel.pro
	tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
	tests/auto/qsqltablemodel/qsqltablemodel.pro
	tests/auto/qsqlthread/qsqlthread.pro
	tests/auto/qwidget/tst_qwidget.cpp

1 files changed, 81 insertions, 54 deletions

diff --git a/src/gui/itemviews/qabstractitemview.cpp b/src/gui/itemviews/qabstractitemview.cpp
index a4f512b..759ee1a 100644
--- a/src/gui/itemviews/qabstractitemview.cpp
+++ b/src/gui/itemviews/qabstractitemview.cpp
@@ -128,6 +128,37 @@ void QAbstractItemViewPrivate::init()
     q->setAttribute(Qt::WA_InputMethodEnabled);
 }
 
+void QAbstractItemViewPrivate::checkMouseMove(const QPersistentModelIndex &index)
+{
+    //we take a persistent model index because the model might change by emitting signals
+    Q_Q(QAbstractItemView);
+    if (viewportEnteredNeeded || enteredIndex != index) {
+        viewportEnteredNeeded = false;
+
+        if (index.isValid()) {
+            emit q->entered(index);
+#ifndef QT_NO_STATUSTIP
+            QString statustip = model->data(index, Qt::StatusTipRole).toString();
+            if (parent && !statustip.isEmpty()) {
+                QStatusTipEvent tip(statustip);
+                QApplication::sendEvent(parent, &tip);
+            }
+#endif
+        } else {
+#ifndef QT_NO_STATUSTIP
+            if (parent) {
+                QString emptyString;
+                QStatusTipEvent tip( emptyString );
+                QApplication::sendEvent(parent, &tip);
+            }
+#endif
+            emit q->viewportEntered();
+        }
+        enteredIndex = index;
+    }
+}
+
+
 /*!
     \class QAbstractItemView
 
@@ -1558,7 +1589,7 @@ void QAbstractItemView::mouseMoveEvent(QMouseEvent *event)
     }
 #endif // QT_NO_DRAGANDDROP
 
-    QModelIndex index = indexAt(bottomRight);
+    QPersistentModelIndex index = indexAt(bottomRight);
     QModelIndex buddy = d->model->buddy(d->pressedIndex);
     if ((state() == EditingState && d->hasEditor(buddy))
         || edit(index, NoEditTriggers, event))
@@ -1569,36 +1600,10 @@ void QAbstractItemView::mouseMoveEvent(QMouseEvent *event)
     else
         topLeft = bottomRight;
 
-    if (d->viewportEnteredNeeded || d->enteredIndex != index) {
-        d->viewportEnteredNeeded = false;
-
-        // signal handlers may change the model
-        QPersistentModelIndex persistent = index;
-        if (persistent.isValid()) {
-            emit entered(persistent);
-#ifndef QT_NO_STATUSTIP
-            QString statustip = d->model->data(persistent, Qt::StatusTipRole).toString();
-            if (parent() && !statustip.isEmpty()) {
-                QStatusTipEvent tip(statustip);
-                QApplication::sendEvent(parent(), &tip);
-            }
-#endif
-        } else {
-#ifndef QT_NO_STATUSTIP
-            if (parent()) {
-                QString emptyString;
-                QStatusTipEvent tip(emptyString);
-                QApplication::sendEvent(parent(), &tip);
-            }
-#endif
-            emit viewportEntered();
-        }
-        d->enteredIndex = persistent;
-        index = persistent;
-    }
+    d->checkMouseMove(index);
 
 #ifndef QT_NO_DRAGANDDROP
-    if (index.isValid()
+    if (d->pressedIndex.isValid()
         && d->dragEnabled
         && (state() != DragSelectingState)
         && (event->buttons() != Qt::NoButton)
@@ -1614,14 +1619,13 @@ void QAbstractItemView::mouseMoveEvent(QMouseEvent *event)
 
         // Do the normalize ourselves, since QRect::normalized() is flawed
         QRect selectionRect = QRect(topLeft, bottomRight);
-        QPersistentModelIndex persistent = index;
         setSelection(selectionRect, command);
 
         // set at the end because it might scroll the view
-        if (persistent.isValid()
-            && (persistent != d->selectionModel->currentIndex())
-            && d->isIndexEnabled(persistent))
-            d->selectionModel->setCurrentIndex(persistent, QItemSelectionModel::NoUpdate);
+        if (index.isValid()
+            && (index != d->selectionModel->currentIndex())
+            && d->isIndexEnabled(index))
+            d->selectionModel->setCurrentIndex(index, QItemSelectionModel::NoUpdate);
     }
 }
 
@@ -2200,6 +2204,8 @@ void QAbstractItemView::resizeEvent(QResizeEvent *event)
 void QAbstractItemView::timerEvent(QTimerEvent *event)
 {
     Q_D(QAbstractItemView);
+    if (event->timerId() == d->fetchMoreTimer.timerId())
+        d->fetchMore();
     if (event->timerId() == d->autoScrollTimer.timerId())
         doAutoScroll();
     else if (event->timerId() == d->updateTimer.timerId())
@@ -2415,7 +2421,7 @@ void QAbstractItemView::updateEditorGeometries()
 void QAbstractItemView::updateGeometries()
 {
     updateEditorGeometries();
-    QMetaObject::invokeMethod(this, "_q_fetchMore", Qt::QueuedConnection);
+    d_func()->fetchMoreTimer.start(0, this); //fetch more later
 }
 
 /*!
@@ -2426,6 +2432,7 @@ void QAbstractItemView::verticalScrollbarValueChanged(int value)
     Q_D(QAbstractItemView);
     if (verticalScrollBar()->maximum() == value && d->model->canFetchMore(d->root))
         d->model->fetchMore(d->root);
+    d->checkMouseMove(viewport()->mapFromGlobal(QCursor::pos()));
 }
 
 /*!
@@ -2436,6 +2443,7 @@ void QAbstractItemView::horizontalScrollbarValueChanged(int value)
     Q_D(QAbstractItemView);
     if (horizontalScrollBar()->maximum() == value && d->model->canFetchMore(d->root))
         d->model->fetchMore(d->root);
+    d->checkMouseMove(viewport()->mapFromGlobal(QCursor::pos()));
 }
 
 /*!
@@ -2958,7 +2966,7 @@ void QAbstractItemView::dataChanged(const QModelIndex &topLeft, const QModelInde
 void QAbstractItemView::rowsInserted(const QModelIndex &, int, int)
 {
     if (!isVisible())
-        QMetaObject::invokeMethod(this, "_q_fetchMore", Qt::QueuedConnection);
+        d_func()->fetchMoreTimer.start(0, this); //fetch more later
     else
         updateEditorGeometries();
 }
@@ -3181,7 +3189,7 @@ void QAbstractItemView::currentChanged(const QModelIndex &current, const QModelI
             update(current);
             edit(current, CurrentChanged, 0);
             if (current.row() == (d->model->rowCount(d->root) - 1))
-                d->_q_fetchMore();
+                d->fetchMore();
         } else {
             d->shouldScrollToCurrentOnShow = d->autoScroll;
         }
@@ -3602,8 +3610,9 @@ QAbstractItemViewPrivate::contiguousSelectionCommand(const QModelIndex &index,
     }
 }
 
-void QAbstractItemViewPrivate::_q_fetchMore()
+void QAbstractItemViewPrivate::fetchMore()
 {
+    fetchMoreTimer.stop();
     if (!model->canFetchMore(root))
         return;
     int last = model->rowCount(root) - 1;
@@ -3876,30 +3885,48 @@ bool QAbstractItemViewPrivate::openEditor(const QModelIndex &index, QEvent *even
     return true;
 }
 
-QPixmap QAbstractItemViewPrivate::renderToPixmap(const QModelIndexList &indexes, QRect *r) const
+/*
+  \internal
+
+  returns the pair QRect/QModelIndex that should be painted on the viewports's rect
+  */
+
+QItemViewPaintPairs QAbstractItemViewPrivate::draggablePaintPairs(const QModelIndexList &indexes, QRect *r) const
 {
+    Q_ASSERT(r);
     Q_Q(const QAbstractItemView);
-    QRect rect = q->visualRect(indexes.at(0));
-    QList<QRect> rects;
+    QRect &rect = *r;
+    const QRect viewportRect = viewport->rect();
+    QItemViewPaintPairs ret;
     for (int i = 0; i < indexes.count(); ++i) {
-        rects.append(q->visualRect(indexes.at(i)));
-        rect |= rects.at(i);
+        const QModelIndex &index = indexes.at(i);
+        const QRect current = q->visualRect(index);
+        if (current.intersects(viewportRect)) {
+            ret += qMakePair(current, index);
+            rect |= current;
+        }
     }
-    rect = rect.intersected(viewport->rect());
-    if (rect.width() <= 0 || rect.height() <= 0)
+    rect &= viewportRect;
+    return ret;
+}
+
+QPixmap QAbstractItemViewPrivate::renderToPixmap(const QModelIndexList &indexes, QRect *r) const
+{
+    Q_ASSERT(r);
+    QItemViewPaintPairs paintPairs = draggablePaintPairs(indexes, r);
+    if (paintPairs.isEmpty())
         return QPixmap();
-    QImage image(rect.size(), QImage::Format_ARGB32_Premultiplied);
-    image.fill(0);
-    QPainter painter(&image);
+    QPixmap pixmap(r->size());
+    pixmap.fill(Qt::transparent);
+    QPainter painter(&pixmap);
     QStyleOptionViewItemV4 option = viewOptionsV4();
     option.state |= QStyle::State_Selected;
-    for (int j = 0; j < indexes.count(); ++j) {
-        option.rect = QRect(rects.at(j).topLeft() - rect.topLeft(), rects.at(j).size());
-        delegateForIndex(indexes.at(j))->paint(&painter, option, indexes.at(j));
+    for (int j = 0; j < paintPairs.count(); ++j) {
+        option.rect = paintPairs.at(j).first.translated(-r->topLeft());
+        const QModelIndex &current = paintPairs.at(j).second;
+        delegateForIndex(current)->paint(&painter, option, current);
     }
-    painter.end();
-    if (r) *r = rect;
-    return QPixmap::fromImage(image);
+    return pixmap;
 }
 
 void QAbstractItemViewPrivate::selectAll(QItemSelectionModel::SelectionFlags command)