From 910066ea21de35877e74ef4489e6f9431a15ec9b Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Mon, 8 Mar 2010 17:38:41 +0100
Subject: [PATCH] QmlDesigner.propertyEditor: closing expression editing on
 enter/return

---
 .../propertyeditor/Qt/ExpressionEditor.qml            | 11 ++++++-----
 .../qmldesigner/propertyeditor/Qt/propertyEditor.css  |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ExpressionEditor.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExpressionEditor.qml
index ab162f42f99..e96def4b26e 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ExpressionEditor.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExpressionEditor.qml
@@ -45,10 +45,9 @@ QWidget {
     }
 
 
-    QTextEdit {
+    ExpressionEdit {
         id: textEdit;
         styleSheet: "QTextEdit {border-radius: 0px;}"
-        acceptRichText: false;
         documentTitle: "Expression"
 
         width: expressionEdit.width
@@ -60,10 +59,12 @@ QWidget {
             if (!focus)
                 expressionEdit.active = false;
         }
-
-
-
+		onReturnPressed: {
+		    expressionEdit.backendValue.expression = textEdit.plainText;
+			expressionEdit.active = false;		
+		}
     }
+	
     QPushButton {
         focusPolicy: "Qt::NoFocus";
         y: expressionEdit.height - 22;
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/propertyEditor.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/propertyEditor.css
index f26903c9c77..68df338f632 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/propertyEditor.css
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/propertyEditor.css
@@ -53,7 +53,7 @@ QLineEdit
                                        stop: 0 #2c2c2c, stop: 1 #333333);
 }
 
-QTextEdit 
+QPlainTextEdit
 {
     border: 2px solid #0F0F0F;
     border-radius: 6px;