diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-08-12 07:12:25 (GMT) |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-08-12 07:12:25 (GMT) |
| commit | 224d8f7619447a4784da533ac26760ea1e7b9087 (patch) | |
| tree | 5407614135100025a375acf049ace2074e3e6f11 /src/gui/widgets/qcombobox.cpp | |
| parent | e7a19af4430b45f371bb33120f0ed39a2c83b733 (diff) | |
| parent | add9c43407a63c28f1107b9a77e74f6f62593246 (diff) | |
| download | Qt-224d8f7619447a4784da533ac26760ea1e7b9087.zip Qt-224d8f7619447a4784da533ac26760ea1e7b9087.tar.gz Qt-224d8f7619447a4784da533ac26760ea1e7b9087.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7
Diffstat (limited to 'src/gui/widgets/qcombobox.cpp')
| -rw-r--r-- | src/gui/widgets/qcombobox.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qcombobox.cpp b/src/gui/widgets/qcombobox.cpp index dcc328f..917a325 100644 --- a/src/gui/widgets/qcombobox.cpp +++ b/src/gui/widgets/qcombobox.cpp @@ -910,7 +910,7 @@ QComboBox::QComboBox(bool rw, QWidget *parent, const char *name) interaction. The highlighted() signal is emitted when the user highlights an item in the combobox popup list. All three signals exist in two versions, one with a QString argument and one with an - \c int argument. If the user selectes or highlights a pixmap, only + \c int argument. If the user selects or highlights a pixmap, only the \c int signals are emitted. Whenever the text of an editable combobox is changed the editTextChanged() signal is emitted. |