Merge commit 'origin/1.3'

share/qtcreator/translations/qtcreator_de.ts

@@ -12334,7 +12334,7 @@ Installiere Anwendung auf &apos;%2&apos;...</translation>
     <message>
         <location line="-28"/>
         <source>No Qt installed</source>
-        <translation>Qt ist nicht installiert&apos;</translation>
+        <translation>Qt ist nicht installiert</translation>
     </message>
 </context>
 <context>

src/plugins/texteditor/basetexteditor.cpp

@@ -1519,7 +1519,8 @@ BaseTextEditorPrivate::BaseTextEditorPrivate()
     m_inBlockSelectionMode(false),
     m_lastEventWasBlockSelectionEvent(false),
     m_blockSelectionExtraX(0),
-    m_moveLineUndoHack(false)
+    m_moveLineUndoHack(false),
+    m_cursorBlockNumber(-1)
 {
 }
 
@@ -2866,6 +2867,22 @@ void BaseTextEditor::updateCurrentLineHighlight()
     }
 
     setExtraSelections(CurrentLineSelection, extraSelections);
+
+
+    // the extra area shows information for the entire current block, not just the currentline.
+    // This is why we must force a bigger update region.
+    int cursorBlockNumber = textCursor().blockNumber();
+    if (cursorBlockNumber != d->m_cursorBlockNumber) {
+        QPointF offset = contentOffset();
+        QTextBlock block = document()->findBlockByNumber(d->m_cursorBlockNumber);
+        if (block.isValid())
+            d->m_extraArea->update(blockBoundingGeometry(block).translated(offset).toAlignedRect());
+        block = document()->findBlockByNumber(cursorBlockNumber);
+        if (block.isValid())
+            d->m_extraArea->update(blockBoundingGeometry(block).translated(offset).toAlignedRect());
+        d->m_cursorBlockNumber = cursorBlockNumber;
+    }
+
 }
 
 void BaseTextEditor::slotCursorPositionChanged()

src/plugins/texteditor/basetexteditor_p.h

@@ -253,6 +253,7 @@ public:
     QTimer *m_highlightBlocksTimer;
 
     QPointer<BaseTextEditorAnimator> m_animator;
+    int m_cursorBlockNumber;
 
 };
 

src/tools/qpatch/files-to-patch-linux

@@ -1,4 +1,5 @@
 bin/qmake
+bin/lrelease
 lib/libQtCore.so
 %%
 lib/libQtCore.la

src/tools/qpatch/files-to-patch-windows

@@ -1,4 +1,5 @@
 bin/qmake.exe
+bin/lrelease.exe
 bin/QtCore4.dll
 bin/QtCored4.dll
 %%