diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2009-10-21 13:26:06 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2009-10-29 16:00:11 (GMT) |
| commit | fccbc9b94d843f4c55834ee75127cd6219b4839a (patch) | |
| tree | 9c02c9429e8ad2140cf1567b74a4908834158199 /src/gui/widgets | |
| parent | f73e3063649220f80b2d0ada3a7f087c32c0bfc8 (diff) | |
| download | Qt-fccbc9b94d843f4c55834ee75127cd6219b4839a.zip Qt-fccbc9b94d843f4c55834ee75127cd6219b4839a.tar.gz Qt-fccbc9b94d843f4c55834ee75127cd6219b4839a.tar.bz2 | |
Fix LIBRARY and ICON
However, compiling with QT_NO_ICON will still not work :(
Reviewed-by: tom
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/qcombobox.h | 1 | ||||
| -rw-r--r-- | src/gui/widgets/qlinecontrol.cpp | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/widgets/qcombobox.h b/src/gui/widgets/qcombobox.h index 6a85096..462636c 100644 --- a/src/gui/widgets/qcombobox.h +++ b/src/gui/widgets/qcombobox.h @@ -52,7 +52,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE QT_MODULE(Gui) - #ifndef QT_NO_COMBOBOX class QAbstractItemView; diff --git a/src/gui/widgets/qlinecontrol.cpp b/src/gui/widgets/qlinecontrol.cpp index 7f9ff82..8f17e98 100644 --- a/src/gui/widgets/qlinecontrol.cpp +++ b/src/gui/widgets/qlinecontrol.cpp @@ -447,8 +447,9 @@ void QLineControl::processInputMethodEvent(QInputMethodEvent *event) cursorPositionChanged = true; } } - +#ifndef QT_NO_IM setPreeditArea(m_cursor, event->preeditString()); +#endif //QT_NO_IM m_preeditCursor = event->preeditString().length(); m_hideCursor = false; QList<QTextLayout::FormatRange> formats; |