diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-08-04 14:12:57 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-08-04 14:12:57 +0200 |
| commit | babf1ff43584b454ac24728fbf93bf291b9f36d1 (patch) | |
| tree | c1d7567183d4a124fd4417a23e558d4fcef847ad /src/gui/kernel/qwidget.cpp | |
| parent | 05e8e8056824dfa56830e12a6a50ec39018df6fc (diff) | |
| parent | a6633a9cf1bb2083d0ce41f4667b3f9349a39865 (diff) | |
| download | qt4-tools-babf1ff43584b454ac24728fbf93bf291b9f36d1.tar.gz | |
Merge remote branch 'qt/master' into lighthouse-master
Conflicts:
configure
Diffstat (limited to 'src/gui/kernel/qwidget.cpp')
| -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 e1e82b7715..f01f881818 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -343,8 +343,10 @@ QInputContext *QWidgetPrivate::inputContext() const #ifndef QT_NO_IM if (ic) return ic; -#endif return qApp->inputContext(); +#else + return 0; +#endif } /*! |