diff options
| author | Sami Merila <sami.merila@nokia.com> | 2009-12-15 11:12:59 (GMT) |
|---|---|---|
| committer | Sami Merila <sami.merila@nokia.com> | 2009-12-15 11:12:59 (GMT) |
| commit | cfc13a80029de5d21a4833945d2a8dffa14c0173 (patch) | |
| tree | 3f4124b086eae345ba9282e7f876ce4003e865e8 /src | |
| parent | a0ce8bba1aae7c1aaf189b83bfe83eb6b80bf0bf (diff) | |
| parent | 5a1b5fc1b6233ee2e1f99d6c5f6ff1115341d02f (diff) | |
| download | Qt-cfc13a80029de5d21a4833945d2a8dffa14c0173.zip Qt-cfc13a80029de5d21a4833945d2a8dffa14c0173.tar.gz Qt-cfc13a80029de5d21a4833945d2a8dffa14c0173.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/widgets/qlineedit_p.cpp | 3 | ||||
| -rw-r--r-- | src/gui/widgets/qplaintextedit.cpp | 1 | ||||
| -rw-r--r-- | src/gui/widgets/qtextedit.cpp | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/src/gui/widgets/qlineedit_p.cpp b/src/gui/widgets/qlineedit_p.cpp index 4437fef..4122bc4 100644 --- a/src/gui/widgets/qlineedit_p.cpp +++ b/src/gui/widgets/qlineedit_p.cpp @@ -149,6 +149,9 @@ void QLineEditPrivate::init(const QString& txt) #endif QObject::connect(control, SIGNAL(cursorPositionChanged(int,int)), q, SLOT(updateMicroFocus())); + + QObject::connect(control, SIGNAL(textChanged(const QString &)), + q, SLOT(updateMicroFocus())); // for now, going completely overboard with updates. QObject::connect(control, SIGNAL(selectionChanged()), diff --git a/src/gui/widgets/qplaintextedit.cpp b/src/gui/widgets/qplaintextedit.cpp index 89fe7b8..f79931a 100644 --- a/src/gui/widgets/qplaintextedit.cpp +++ b/src/gui/widgets/qplaintextedit.cpp @@ -761,6 +761,7 @@ void QPlainTextEditPrivate::init(const QString &txt) QObject::connect(control, SIGNAL(cursorPositionChanged()), q, SLOT(_q_cursorPositionChanged())); QObject::connect(control, SIGNAL(cursorPositionChanged()), q, SIGNAL(cursorPositionChanged())); + QObject::connect(control, SIGNAL(textChanged(const QString &)), q, SLOT(updateMicroFocus())); // set a null page size initially to avoid any relayouting until the textedit // is shown. relayoutDocument() will take care of setting the page size to the diff --git a/src/gui/widgets/qtextedit.cpp b/src/gui/widgets/qtextedit.cpp index 1bc0bf1..63fac2a 100644 --- a/src/gui/widgets/qtextedit.cpp +++ b/src/gui/widgets/qtextedit.cpp @@ -158,6 +158,8 @@ void QTextEditPrivate::init(const QString &html) QObject::connect(control, SIGNAL(selectionChanged()), q, SIGNAL(selectionChanged())); QObject::connect(control, SIGNAL(cursorPositionChanged()), q, SIGNAL(cursorPositionChanged())); + QObject::connect(control, SIGNAL(textChanged(const QString &)), q, SLOT(updateMicroFocus())); + QTextDocument *doc = control->document(); // set a null page size initially to avoid any relayouting until the textedit // is shown. relayoutDocument() will take care of setting the page size to the |