diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-03-30 14:59:03 (GMT) |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-03-30 14:59:03 (GMT) |
commit | f9c434cd70663db2d1b1c32c8b68ae3ff85d6803 (patch) | |
tree | 32ba957e42491ae7634c6a8999485a43e5f68f42 /tools | |
parent | e20d18f1982dde2b0fa9bd262e5aadd1e451a7fa (diff) | |
parent | 097b3b3323ab6641c17318057e100543b60bca77 (diff) | |
download | Qt-f9c434cd70663db2d1b1c32c8b68ae3ff85d6803.zip Qt-f9c434cd70663db2d1b1c32c8b68ae3ff85d6803.tar.gz Qt-f9c434cd70663db2d1b1c32c8b68ae3ff85d6803.tar.bz2 |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'tools')
-rw-r--r-- | tools/designer/src/lib/shared/textpropertyeditor.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/designer/src/lib/shared/textpropertyeditor.cpp b/tools/designer/src/lib/shared/textpropertyeditor.cpp index cf12842..95a9f85 100644 --- a/tools/designer/src/lib/shared/textpropertyeditor.cpp +++ b/tools/designer/src/lib/shared/textpropertyeditor.cpp @@ -293,6 +293,7 @@ namespace qdesigner_internal { } setFocusProxy(m_lineEdit); + setText(m_cachedText); markIntermediateState(); } |