summaryrefslogtreecommitdiffstats
path: root/src/kernel/ntqwidget.h
diff options
context:
space:
mode:
authorAlexander Golubev <fatzer2@gmail.com>2024-03-07 22:26:26 +0300
committerMichele Calgaro <michele.calgaro@yahoo.it>2024-03-08 10:52:02 +0900
commitee2df97887ab95cc6d8bc49ee70e03d80b206bd3 (patch)
tree6a4cad3ea33bdfa88572714c71f18c7d39b6f75d /src/kernel/ntqwidget.h
parent9aa03105abc2fa3f72adc74db2d994d400be5a63 (diff)
downloadtqt3-ee2df978.tar.gz
tqt3-ee2df978.zip
Fix compilation with -disable-inputmethod and -no-inputmethod
As for now here are two sets of inputmethod options: - -enable-inputmethod/disable-inputmethod - which seems to supposed to control whether build the 'inputmethod' module or not - -inputmethod/-no-inputmethod - which seems to supposed to enable/disable inputmethod support without changing the ABI. Before the patch both -disable-inputmethod and -no-inputmethod were just breaking the build: -no-inputmethod were disabling some code with support for the module, but didn't disabled the module build itself nor build of plugins. -disable-inputmethod were disabling build of plugins and module, but didn't disabled code depending upon it. It seems the inputmethod support were still WIP when the last release of Qt3 came to be, hence the mess. This patch fixes the build if both -disable-inputmethod AND -no-inputmethod are supplied. Disabling only one is not enough due to tqmake/configure have problems handling two different options of the same name. Later the -inputmethod/-no-inputmethod should be probably removed entirely. Signed-off-by: Alexander Golubev <fatzer2@gmail.com> (cherry picked from commit fad4acbe084403340bb0ee6979ea18db464e7085)
Diffstat (limited to 'src/kernel/ntqwidget.h')
-rw-r--r--src/kernel/ntqwidget.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/kernel/ntqwidget.h b/src/kernel/ntqwidget.h
index aec9c6d2..7e589c1a 100644
--- a/src/kernel/ntqwidget.h
+++ b/src/kernel/ntqwidget.h
@@ -52,7 +52,7 @@
#include "ntqsizepolicy.h"
#endif // QT_H
-#if defined(TQ_WS_X11) && !defined(TQT_NO_IM)
+#if defined(TQ_WS_X11)
class TQInputContext;
#endif