From 7c8f13b0226ba6cda04862d6fd682cc658249b5f Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 16 Jun 2019 23:54:58 +0900 Subject: Renamed QT_IM_* to TQT_IM_*. This relates to bug 3020. (cherry picked and partially edited from commit 632cbaa30ac55924b21d9e65bbe261d592098553) Signed-off-by: Michele Calgaro --- plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp | 4 ++-- plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'plugins') diff --git a/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp b/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp index a721d9739..789f5b380 100644 --- a/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp +++ b/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp @@ -61,8 +61,8 @@ TQMultiInputContext::TQMultiInputContext() keyDict.setAutoDelete( true ); keyDict.clear(); - if ( getenv( "QT_IM_MODULE" ) ) { - currentIMKey = getenv( "QT_IM_MODULE" ); + if ( getenv( "TQT_IM_MODULE" ) ) { + currentIMKey = getenv( "TQT_IM_MODULE" ); } else { #ifndef QT_NO_IM_EXTENSIONS TQSettings settings; diff --git a/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp b/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp index 9f6014be5..a7b5007b2 100644 --- a/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp +++ b/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp @@ -70,8 +70,8 @@ TQInputContext *TQNoneInputContextPlugin::create( const TQString &key ) if ( ! isIMSwitcher ) return 0; - if ( getenv( "QT_IM_MODULE" ) ) { - actuallySpecifiedKey = getenv( "QT_IM_MODULE" ); + if ( getenv( "TQT_IM_MODULE" ) ) { + actuallySpecifiedKey = getenv( "TQT_IM_MODULE" ); } else { TQSettings settings; actuallySpecifiedKey = settings.readEntry( "/qt/DefaultInputMethod", "xim" ); -- cgit v1.2.1