diff options
| author | Ning Chi <ext-chi.ning@nokia.com> | 2010-12-02 11:29:54 +0200 |
|---|---|---|
| committer | Pekka Vuorela <pekka.ta.vuorela@nokia.com> | 2010-12-03 15:52:29 +0200 |
| commit | b66adf3d65fb66454fc4a8cf14e2a09cb4bf6c0c (patch) | |
| tree | 72c819437d4c645b4c5db6b742f4a3bae8a5f782 | |
| parent | a59954cbaa19da0bbac6caf3bde42f35a989fd2d (diff) | |
Revert "Changes: don't load MInputContext by default (explicitly)"
This reverts commit bc89dbea8361cf43a7212dbaf27cbf1783e37e64.
Which causes "can not use clicking word to enable preedit" regression.
| -rw-r--r-- | src/corelib/core/mcomponentdata.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/core/mcomponentdata.cpp b/src/corelib/core/mcomponentdata.cpp index 10c5d056..651a58d8 100644 --- a/src/corelib/core/mcomponentdata.cpp +++ b/src/corelib/core/mcomponentdata.cpp @@ -70,7 +70,7 @@ namespace #else QtMsgType g_debug_level(QtWarningMsg); #endif - bool g_loadMInputContext(false); + bool g_loadMInputContext(true); FILE *debugingOutput; MSyslogClientSocket * g_syslogSocket = 0; } @@ -620,6 +620,8 @@ void MComponentDataPrivate::parseArguments(int &argc, char **argv, argv[0]); exit(EXIT_FAILURE); } + } else if (s == "-disable-m-input-context") { + g_loadMInputContext = false; } else if (s == "-target") { if (i < (argc - 1)) { i++; |