1 files changed, 11 insertions, 3 deletions
diff --git a/src/widgets/qlineedit.cpp b/src/widgets/qlineedit.cpp
index bcf9b2d0d..eba3f6b20 100644
--- a/src/widgets/qlineedit.cpp
+++ b/src/widgets/qlineedit.cpp
@@ -877,10 +877,18 @@ void TQLineEdit::backspace()
     if ( d->hasSelectedText() ) {
 	d->removeSelectedText();
     } else if ( d->cursor ) {
+	--d->cursor;
+	if ( d->maskData ) {
+	    d->cursor = d->prevMaskBlank( d->cursor );
+	}
+	// second half of a surrogate, check if we have the first half as well,
+	// if yes delete both at once
+	if (d->cursor > 0 && d->text.at(d->cursor).isLowSurrogate() &&
+	        d->text.at(d->cursor - 1).isHighSurrogate()) {
+	    d->del(true);
 	    --d->cursor;
-	    if ( d->maskData )
-		d->cursor = d->prevMaskBlank( d->cursor );
-	    d->del( TRUE );
+	}
+	d->del(true);
     }
     d->finishChange( priorState );
 }