Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt

Conflicts:
	configure.exe
	tests/auto/qpainter/tst_qpainter.cpp
	translations/qt_ru.ts

1 files changed, 3 insertions, 3 deletions

diff --git a/src/gui/dialogs/qinputdialog.cpp b/src/gui/dialogs/qinputdialog.cpp
index 8c0c2c7..e2c5742 100644
--- a/src/gui/dialogs/qinputdialog.cpp
+++ b/src/gui/dialogs/qinputdialog.cpp
@@ -1128,8 +1128,8 @@ void QInputDialog::done(int result)
     is \a parent. The dialog will be modal and uses the specified widget
     \a flags.
 
-    This function returns the text which has been entered in the line
-    edit. It will not return an empty string.
+    If the dialog is accepted, this function returns the text in the dialog's
+    line edit. If the dialog is rejected, a null QString is returned.
 
     Use this static function like this:
 
@@ -1158,7 +1158,7 @@ QString QInputDialog::getText(QWidget *parent, const QString &title, const QStri
     if (ret) {
         return dialog.textValue();
     } else {
-        return text;
+        return QString();
     }
 }