summaryrefslogtreecommitdiff
path: root/src/qt3support
diff options
context:
space:
mode:
authorRhys Weatherley <rhys.weatherley@nokia.com>2009-04-22 07:03:06 +1000
committerRhys Weatherley <rhys.weatherley@nokia.com>2009-04-22 07:03:06 +1000
commitdb4e2a600c53ad857d7fa3f7d84ac995215ecf93 (patch)
tree88ca89842925080cf18eb9f796310a89216828b0 /src/qt3support
parent4f64ff3e8902529700336c7ad3aa9fccf5ca3e0b (diff)
parentc36ff16f66ffd65839ba1e254ac557e491db6bf4 (diff)
downloadqt4-tools-db4e2a600c53ad857d7fa3f7d84ac995215ecf93.tar.gz
Merge branch '4.5'
Conflicts: src/gui/graphicsview/qgraphicsitem.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
Diffstat (limited to 'src/qt3support')
-rw-r--r--src/qt3support/dialogs/q3filedialog.cpp13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/qt3support/dialogs/q3filedialog.cpp b/src/qt3support/dialogs/q3filedialog.cpp
index 85f81b3b1b..b9f8196a68 100644
--- a/src/qt3support/dialogs/q3filedialog.cpp
+++ b/src/qt3support/dialogs/q3filedialog.cpp
@@ -631,6 +631,7 @@ public:
protected:
void keyPressEvent(QKeyEvent *e);
void focusOutEvent(QFocusEvent *e);
+ void emitDoRename();
signals:
void cancelRename();
@@ -1143,16 +1144,20 @@ void QRenameEdit::keyPressEvent(QKeyEvent *e)
void QRenameEdit::focusOutEvent(QFocusEvent *)
{
- if (!doRenameAlreadyEmitted) {
- doRenameAlreadyEmitted = true;
- emit doRename();
- }
+ if (!doRenameAlreadyEmitted)
+ emitDoRename();
}
void QRenameEdit::slotReturnPressed()
{
+ emitDoRename();
+}
+
+void QRenameEdit::emitDoRename()
+{
doRenameAlreadyEmitted = true;
emit doRename();
+ doRenameAlreadyEmitted = false;
}
/************************************************************************