Merge remote branch 'origin/4.6' into qt-4.7-from-4.6

Conflicts:
	bin/syncqt
	src/3rdparty/webkit/VERSION
	src/3rdparty/webkit/WebCore/ChangeLog
	src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.cpp
	src/3rdparty/webkit/WebCore/bridge/qt/qt_runtime.h
	src/3rdparty/webkit/WebCore/page/FrameView.cpp
	src/3rdparty/webkit/WebCore/page/FrameView.h
	src/3rdparty/webkit/WebCore/platform/ScrollView.cpp
	src/3rdparty/webkit/WebCore/platform/ScrollView.h
	src/corelib/plugin/quuid.cpp
	src/gui/dialogs/qfontdialog.cpp
	src/multimedia/audio/qaudiodevicefactory.cpp
	src/opengl/qgl.cpp
	src/openvg/qpaintengine_vg.cpp
	tests/auto/qxmlquery/tst_qxmlquery.cpp

1 files changed, 4 insertions, 3 deletions

diff --git a/src/gui/text/qtexttable.cpp b/src/gui/text/qtexttable.cpp
index 5100176..ada18c8 100644
--- a/src/gui/text/qtexttable.cpp
+++ b/src/gui/text/qtexttable.cpp
@@ -915,12 +915,13 @@ void QTextTable::removeColumns(int pos, int num)
     for (int r = 0; r < d->nRows; ++r) {
         for (int c = pos; c < pos + num; ++c) {
             int cell = d->grid[r*d->nCols + c];
-            if (touchedCells.contains(cell))
-                continue;
-            touchedCells << cell;
             QTextDocumentPrivate::FragmentIterator it(&p->fragmentMap(), cell);
             QTextCharFormat fmt = collection->charFormat(it->format);
             int span = fmt.tableCellColumnSpan();
+            if (touchedCells.contains(cell) && span <= 1)
+                continue;
+            touchedCells << cell;
+
             if (span > 1) {
                 fmt.setTableCellColumnSpan(span - 1);
                 p->setCharFormat(it.position(), 1, fmt);