diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-08-26 10:50:14 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-08-26 10:50:14 (GMT) |
| commit | c7364a6c6ceadf729aa7c251c777ec518ca9cc40 (patch) | |
| tree | 0d407073f00d0f00cec503d00a8bdf4fb93407e4 | |
| parent | 04c67e5330626853b9277b88e92a79bb7837990b (diff) | |
| parent | b5ae51f7b9a127b10034aa76dd631ac94eb75347 (diff) | |
| download | Qt-c7364a6c6ceadf729aa7c251c777ec518ca9cc40.zip Qt-c7364a6c6ceadf729aa7c251c777ec518ca9cc40.tar.gz Qt-c7364a6c6ceadf729aa7c251c777ec518ca9cc40.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
| -rw-r--r-- | src/gui/kernel/qwidget.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index 7e88e9f..62d0848 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -187,6 +187,9 @@ QWidgetPrivate::QWidgetPrivate(int version) , extraPaintEngine(0) , polished(0) , graphicsEffect(0) +#if !defined(QT_NO_IM) + , imHints(Qt::ImhNone) +#endif , inheritedFontResolveMask(0) , inheritedPaletteResolveMask(0) , leftmargin(0) @@ -217,7 +220,6 @@ QWidgetPrivate::QWidgetPrivate(int version) , window_event(0) , qd_hd(0) #endif - ,imHints(Qt::ImhNone) { if (!qApp) { qFatal("QWidget: Must construct a QApplication before a QPaintDevice"); |