diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-10 01:37:56 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-10 01:37:56 (GMT) |
| commit | 6988f2bb36dafc2223c326b6fd21e49586b1379b (patch) | |
| tree | 36ddaa20020353c998d30a127122cd6c5973d857 /src/gui/kernel/qapplication.h | |
| parent | 0de5087cf17e1c1c37da166b2f531525b9060d71 (diff) | |
| parent | 1cfb16f694cf5649a8cef11bd096be3b20d06b36 (diff) | |
| download | Qt-6988f2bb36dafc2223c326b6fd21e49586b1379b.zip Qt-6988f2bb36dafc2223c326b6fd21e49586b1379b.tar.gz Qt-6988f2bb36dafc2223c326b6fd21e49586b1379b.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (59 commits)
Doc: Cleaning style and adding support for Creator
Add NTLMv2 authentication support to QAuthenticator.
QIODPLB: Sync behavior of ungetBlock() and ungetChar()
QFileIconProvider: Load icons on demand.
Doc: fixing offline style
Fix handling of SSL certificates with wildcard domain names
Doc: fixing examples link
doc: Fixed several qdoc warnings.
doc: Fixed several qdoc warnings.
SSL library loading: load system libs only once
Revert "SSL backend: load libraries for certificates only once"
doc: Fixed several qdoc warnings.
doc: Fixed several qdoc warnings.
doc: Fixed several qdoc warnings.
doc: Fixed several qdoc warnings.
doc: Fixed several qdoc warnings.
Doc: Adding support for Qt Creator style
doc: Fixed last of the declarative/QML qdoc warnings.
qdoc: Marked some missing declarative properties and functions as \internal.
qhelpgenerator: Fix namespace syntax checking.
...
Diffstat (limited to 'src/gui/kernel/qapplication.h')
| -rw-r--r-- | src/gui/kernel/qapplication.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/kernel/qapplication.h b/src/gui/kernel/qapplication.h index d31d9e5..799d4c2 100644 --- a/src/gui/kernel/qapplication.h +++ b/src/gui/kernel/qapplication.h @@ -267,8 +267,11 @@ public: virtual void commitData(QSessionManager& sm); virtual void saveState(QSessionManager& sm); #endif + +#ifndef QT_NO_IM void setInputContext(QInputContext *); QInputContext *inputContext() const; +#endif static QLocale keyboardInputLocale(); static Qt::LayoutDirection keyboardInputDirection(); |