summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOBATA Akio <obache@wizdas.com>2023-11-13 14:09:22 +0900
committerOBATA Akio <obache@wizdas.com>2023-11-13 14:11:03 +0900
commit73e6afa2ee2871d3cf47df6cea6d818876bd3642 (patch)
tree72d65a40135a73e28c51d8364eb7376eae4a1668
parentd0e6f238acec8dd816618b0e9cf16eec498b573f (diff)
downloadtqtinterface-73e6afa2.tar.gz
tqtinterface-73e6afa2.zip
Change to build and install inputmethod files if enabled
Signed-off-by: OBATA Akio <obache@wizdas.com>
-rw-r--r--ConfigureChecks.cmake3
-rw-r--r--qtinterface/CMakeLists.txt6
-rw-r--r--qtinterface/interface_tqt3/tqinputcontextplugin.cpp23
-rw-r--r--qtinterface/interface_tqt3/tqinputcontextplugin.h28
4 files changed, 60 insertions, 0 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index f76d691..1b1dfa2 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -209,3 +209,6 @@ if( ( HAVE_GLU_OPENGL OR HAVE_GLU_GL ) AND TQGLWIDGET )
tde_message_fatal( "OpenGL has been requested, but neither the OpenGL headers or tqt3 with OpenGL support have been found on your system" )
endif()
endif( OPENGL_ENABLED )
+
+##### check for Inputmethod
+string( REGEX MATCH " inputmethod " INPUTMETHOD_ENABLED " ${TQT_CONF_VARS} " )
diff --git a/qtinterface/CMakeLists.txt b/qtinterface/CMakeLists.txt
index db7a8ec..8e88317 100644
--- a/qtinterface/CMakeLists.txt
+++ b/qtinterface/CMakeLists.txt
@@ -27,6 +27,10 @@ link_directories(
${TQT_LIBRARY_DIR}
)
+if ( INPUTMETHOD_ENABLED )
+ set( INPUTMETHOD_HEADERS ${IFACE}/tqinputcontext.h ${IFACE}/tqinputcontextfactory.h ${IFACE}/tqinputcontextplugin.h )
+ set( INPUTMETHOD_SOURCES ${IFACE}/tqinputcontext.cpp ${IFACE}/tqinputcontextfactory.cpp ${IFACE}/tqinputcontextplugin.cpp )
+endif()
##### headers ###################################
@@ -88,6 +92,7 @@ install( FILES
${IFACE}/private/tqlayoutengine_p.h ${IFACE}/private/tqinternal_p.h ${IFACE}/private/tqeffects_p.h
${IFACE}/private/tqrichtext_p.h ${IFACE}/private/tqpluginmanager_p.h ${IFACE}/private/tqcom_p.h
${IFACE}/private/tqucom_p.h ${IFACE}/private/tqwidgetinterface_p.h ${IFACE}/private/tqtextengine_p.h
+ ${INPUTMETHOD_HEADERS}
DESTINATION ${INCLUDE_INSTALL_DIR} )
##### tqt tools #################################
@@ -185,6 +190,7 @@ tde_add_library( tqt SHARED
${IFACE}/tqvaluelist.cpp ${IFACE}/tqvaluestack.cpp ${IFACE}/tqvaluevector.cpp ${IFACE}/tqvariant.cpp ${IFACE}/tqvfbhdr.cpp
${IFACE}/tqwaitcondition.cpp ${IFACE}/tqwhatsthis.cpp ${IFACE}/tqwidgetfactory.cpp ${IFACE}/tqwidgetintdict.cpp
${IFACE}/tqwidgetlist.cpp ${IFACE}/tqwmatrix.cpp ${IFACE}/tqxml.cpp ${IFACE}/private/tqucomextra_p.cpp
+ ${INPUTMETHOD_SOURCES}
VERSION 4.2.0
LINK ${TQT_LIBRARIES}
DESTINATION ${LIB_INSTALL_DIR}
diff --git a/qtinterface/interface_tqt3/tqinputcontextplugin.cpp b/qtinterface/interface_tqt3/tqinputcontextplugin.cpp
new file mode 100644
index 0000000..22b4620
--- /dev/null
+++ b/qtinterface/interface_tqt3/tqinputcontextplugin.cpp
@@ -0,0 +1,23 @@
+/*
+
+Copyright (C) 2010 Timothy Pearson <kb9vqf@pearsoncomputing.net>
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public License
+along with this library; see the file COPYING.LIB. If not, write to
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
+
+*/
+
+#include <tqt.h>
+#include <ntqinputcontextplugin.h>
diff --git a/qtinterface/interface_tqt3/tqinputcontextplugin.h b/qtinterface/interface_tqt3/tqinputcontextplugin.h
new file mode 100644
index 0000000..1188fdd
--- /dev/null
+++ b/qtinterface/interface_tqt3/tqinputcontextplugin.h
@@ -0,0 +1,28 @@
+/*
+
+Copyright (C) 2010 Timothy Pearson <kb9vqf@pearsoncomputing.net>
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public License
+along with this library; see the file COPYING.LIB. If not, write to
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
+
+*/
+
+#ifndef TQT_TQINPUTCONTEXTPLUGIN_H
+#define TQT_TQINPUTCONTEXTPLUGIN_H
+
+#include <tqt.h>
+#include <ntqinputcontextplugin.h>
+
+#endif /* TQT_TQINPUTCONTEXTPLUGIN_H */