diff options
| author | Jing Bai <jing.bai@digia.com> | 2013-01-15 18:04:10 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-21 10:15:20 (GMT) |
| commit | 8c2284e811d6a1e5d1d5f0703f127e66800baf78 (patch) | |
| tree | 54636ac29412d8ceaacacdab831065808a468e00 /src/corelib/global | |
| parent | 32426500bc9126de7322ce666e1fae4c0848731f (diff) | |
| download | Qt-8c2284e811d6a1e5d1d5f0703f127e66800baf78.zip Qt-8c2284e811d6a1e5d1d5f0703f127e66800baf78.tar.gz Qt-8c2284e811d6a1e5d1d5f0703f127e66800baf78.tar.bz2 | |
To support QT_NO_IM on Linux/Windows/Mac
Fix compilation issue when QT_NO_IM is defined.
Also fixed references in tests. But fixing
plugins/examples seem not necessary at this point.
Task-number: QTBUG-26109
Change-Id: I2067051951616012117efa6716640cbf198fdb2a
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qfeatures.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h index 7424535..1642947 100644 --- a/src/corelib/global/qfeatures.h +++ b/src/corelib/global/qfeatures.h @@ -888,3 +888,11 @@ #define QT_NO_PRINTPREVIEWDIALOG #endif +//Input Method +#if defined(QT_NO_IM) +#define QT_NO_XIM +#endif + +#if defined(QT_NO_IM) +#define QT_NO_QWS_INPUTMETHODS +#endif |