diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-13 08:36:00 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-13 08:36:00 (GMT) |
| commit | 03a55630cfccf7f6ed01d865c541e07afb25c96e (patch) | |
| tree | 25b4fe750bccad037068ca043b700db0b2cceef4 /doc/src/examples | |
| parent | 8e309899b8287b67905072927df1e00effc2a13e (diff) | |
| parent | de20fdfb1da72d2ad89689f46f8412c04c25fc96 (diff) | |
| download | Qt-03a55630cfccf7f6ed01d865c541e07afb25c96e.zip Qt-03a55630cfccf7f6ed01d865c541e07afb25c96e.tar.gz Qt-03a55630cfccf7f6ed01d865c541e07afb25c96e.tar.bz2 | |
Merge remote branch 'origin/4.6' into qt-master-from-4.6
Conflicts:
qmake/generators/symbian/symmake.cpp
Diffstat (limited to 'doc/src/examples')
| -rw-r--r-- | doc/src/examples/googlesuggest.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/examples/googlesuggest.qdoc b/doc/src/examples/googlesuggest.qdoc index cd6c6b1..f2bdb4f 100644 --- a/doc/src/examples/googlesuggest.qdoc +++ b/doc/src/examples/googlesuggest.qdoc @@ -111,7 +111,7 @@ event processing. Key event handling is implemented so that Enter and Return execute the - selected link, while the Escape key hides the popup. Sine we want to be + selected link, while the Escape key hides the popup. Since we want to be able to navigate the list of suggestions using the different navigation keys on the keyboard we let Qt continue regular event processing for those by returning false from the eventFilter reimplementation. |