1 files changed, 15 insertions, 8 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index e00d333..b618183 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -726,8 +726,18 @@ void QDeclarativeTextInput::setEchoMode(QDeclarativeTextInput::EchoMode echo)
     Q_D(QDeclarativeTextInput);
     if (echoMode() == echo)
         return;
-
+    Qt::InputMethodHints imHints = inputMethodHints();
+    if (echo == Password || echo == NoEcho)
+        imHints |= Qt::ImhHiddenText;
+    else
+        imHints &= ~Qt::ImhHiddenText;
+    if (echo != Normal)
+        imHints |= (Qt::ImhNoAutoUppercase | Qt::ImhNoPredictiveText);
+    else
+        imHints &= ~(Qt::ImhNoAutoUppercase | Qt::ImhNoPredictiveText);
+    setInputMethodHints(imHints);
     d->control->setEchoMode((uint)echo);
+    update();
     emit echoModeChanged(echoMode());
 }
 
@@ -779,9 +789,8 @@ void QDeclarativeTextInputPrivate::startCreatingCursor()
     }else if(cursorComponent->isLoading()){
         q->connect(cursorComponent, SIGNAL(statusChanged(int)),
                 q, SLOT(createCursor()));
-    }else{//isError
-        qmlInfo(q) << QDeclarativeTextInput::tr("Could not load cursor delegate");
-        qWarning() << cursorComponent->errors();
+    }else {//isError
+        qmlInfo(q, cursorComponent->errors()) << QDeclarativeTextInput::tr("Could not load cursor delegate");
     }
 }
 
@@ -789,8 +798,7 @@ void QDeclarativeTextInput::createCursor()
 {
     Q_D(QDeclarativeTextInput);
     if(d->cursorComponent->isError()){
-        qmlInfo(this) << tr("Could not load cursor delegate");
-        qWarning() << d->cursorComponent->errors();
+        qmlInfo(this, d->cursorComponent->errors()) << tr("Could not load cursor delegate");
         return;
     }
 
@@ -801,8 +809,7 @@ void QDeclarativeTextInput::createCursor()
         delete d->cursorItem;
     d->cursorItem = qobject_cast<QDeclarativeItem*>(d->cursorComponent->create());
     if(!d->cursorItem){
-        qmlInfo(this) << tr("Could not instantiate cursor delegate");
-        //The failed instantiation should print its own error messages
+        qmlInfo(this, d->cursorComponent->errors()) << tr("Could not instantiate cursor delegate");
         return;
     }