Author: yamakenz
Date: Fri Sep 21 10:41:24 2007
New Revision: 5000
Added:
trunk/qt4/Makefile.am
trunk/qt4/immodule/quiminputcontextplugin.pro.in
- copied, changed from r4999,
/trunk/qt4/immodule/quiminputcontextplugin.pro
Removed:
trunk/qt4/immodule/install
trunk/qt4/immodule/quiminputcontextplugin.pro
Modified:
trunk/Makefile.am
trunk/configure.ac
trunk/qt4/immodule/plugin.cpp
trunk/qt4/immodule/quiminputcontext.cpp
Log:
* This commit make Qt4 immodule configurable and installable via
top-level make
* qt4/immodule/plugin.cpp
- (UimInputContextPlugin::createLanguageList): Return JKC* as same
as Qt3 immodule
* qt4/immodule/quiminputcontext.cpp
- (QUimInputContext::setMicroFocus): Suppress warning
* qt4/immodule/quiminputcontextplugin.pro.in
- New file copied from quiminputcontextplugin.pro
- Cooperate with configure
* qt4/immodule/quiminputcontextplugin.pro
* qt4/immodule/install
- Removed
* qt4/Makefile.am
- New file
- (SUBDIRS): Add immodule and edittest
* Makefile.am
- (SUBDIRS): Add qt4
* configure.ac
- Add AC_PATH_PROGS for qmake-qt4
- Add --with-qt4-immodule
- (QT_CONFIG_OPTS): set 'debug' or 'release' in accordance with
--enable-debug
- Add qt4/Makefile and qt4/immodule/quiminputcontextplugin.pro to
AC_CONFIG_FILES
- Add qmake invocation for qt4/immodule/Makefile and
qt4/edittest/Makefile
Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am (original)
+++ trunk/Makefile.am Fri Sep 21 10:41:24 2007
@@ -2,7 +2,7 @@
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = m4 doc replace sigscheme uim scm test \
- gtk helper qt xim fep emacs \
+ gtk helper qt qt4 xim fep emacs \
po pixmaps examples
EXTRA_DIST = RELNOTE ChangeLog.old autogen.sh make-dist.sh \
uim.pc.in uim.desktop uim.spec.in uim.spec \
Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Fri Sep 21 10:41:24 2007
@@ -22,6 +22,7 @@
AC_PATH_PROG(RSVG, rsvg)
AC_PATH_PROGS(MD5, md5 md5sum)
AC_PATH_PROGS(SHA1, sha1 sha1sum)
+AC_PATH_PROGS(QMAKE_QT4, qmake-qt4 qmake4 qmake)
AM_MAINTAINER_MODE
@@ -744,6 +745,28 @@
use_qtimmodule="no"
])
+dnl *****************************
+dnl *** Check for Qt4 Library ***
+dnl *****************************
+AC_ARG_WITH(qt4-immodule,
+ AC_HELP_STRING([--with-qt4-immodule],
+ [Build qt4-immodule extension
+ @<:@default=no@:>@]),
+ [
+ case $with_qt4_immodule in
+ no)
+ use_qt4_immodule="no"
+ ;;
+ yes|*)
+ use_qt4_immodule="yes"
+ ;;
+ esac
+
+ ],
+ [
+ use_qt4_immodule="no"
+ ])
+
default_toolkit="gtk"
AC_ARG_ENABLE(default-toolkit,
AC_HELP_STRING([--enable-default-toolkit],
@@ -1292,6 +1315,8 @@
AX_CFLAGS_GCC_OPTION([-std=c89])
fi
AX_LANG_WNOERROR # end AC_LANG_WERROR
+
+ QT_CONFIG_OPTS="debug"
else
CFLAGS="$CFLAGS -DNDEBUG"
CXXFLAGS="$CXXFLAGS -DNDEBUG"
@@ -1308,6 +1333,8 @@
AX_CFLAGS_GCC_OPTION([-Wno-unused-parameter], [SCIM_CFLAGS])
AX_CFLAGS_GCC_OPTION([-Wno-unused-variable], [SCIM_CFLAGS])
AX_LANG_WNOERROR # end AC_LANG_WERROR
+
+ QT_CONFIG_OPTS="release"
fi
AC_ARG_ENABLE(warnings-into-error,
@@ -1335,6 +1362,7 @@
])
AC_SUBST(UIM_SCM_CFLAGS)
AC_SUBST(SCIM_CFLAGS)
+AC_SUBST(QT_CONFIG_OPTS)
# Checks for system services
@@ -1379,6 +1407,8 @@
qt/chardict/po/Makefile.in
qt/test/Makefile
qt/uimapplet.desktop
+ qt4/Makefile
+ qt4/immodule/quiminputcontextplugin.pro
xim/Makefile
fep/Makefile
emacs/Makefile
@@ -1395,6 +1425,13 @@
AC_OUTPUT
+# Generate Makefiles for Qt4 by qmake
+if test x$use_qt4_immodule = xyes; then
+ ${QMAKE_QT4} -o qt4/immodule/Makefile \
+ qt4/immodule/quiminputcontextplugin.pro
+ ${QMAKE_QT4} -o qt4/edittest/Makefile qt4/edittest/edittest.pro
+fi
+
AC_MSG_RESULT([
Configure Result :
@@ -1407,8 +1444,9 @@
SCIM : ${use_scim}
Gtk+ : ${use_gtk2}
Gnome Applet : ${use_applet_gnome}
- Qt : ${use_qt}
- Qt immodule : ${use_qtimmodule}
+ Qt3 : ${use_qt}
+ Qt3 immodule : ${use_qtimmodule}
+ Qt4 immodule : ${use_qt4_immodule}
KDE Applet : ${use_applet_kde}
FEP : ${use_uim_fep}
Emacs : ${use_uim_el}
Added: trunk/qt4/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/qt4/Makefile.am Fri Sep 21 10:41:24 2007
@@ -0,0 +1 @@
+SUBDIRS = immodule edittest
Modified: trunk/qt4/immodule/plugin.cpp
==============================================================================
--- trunk/qt4/immodule/plugin.cpp (original)
+++ trunk/qt4/immodule/plugin.cpp Fri Sep 21 10:41:24 2007
@@ -125,10 +125,8 @@
QStringList UimInputContextPlugin::createLanguageList( const QString &key )
const
{
- /*
- if ( key == QString( "uim" ) )
- return "ja:ko:zh:*";
- */
+ if ( key == "uim" )
+ return QStringList() << "ja" << "ko" << "zh" << "*";
#if UIM_QT_LIST_SUBIM_AS_QTIM
uim_context tmp_uc = uim_create_context( NULL, "UTF-8",
Modified: trunk/qt4/immodule/quiminputcontext.cpp
==============================================================================
--- trunk/qt4/immodule/quiminputcontext.cpp (original)
+++ trunk/qt4/immodule/quiminputcontext.cpp Fri Sep 21 10:41:24 2007
@@ -359,6 +359,9 @@
void QUimInputContext::setMicroFocus( int x, int y, int w, int h, QFont *f )
{
qDebug("IC setMicroFocus (%d, %d), (%d, %d)", x, y, w, h);
+
+ f = f; // to suppress warning
+
cwin->layoutWindow( x, y, w, h );
}
Copied: trunk/qt4/immodule/quiminputcontextplugin.pro.in (from r4999,
/trunk/qt4/immodule/quiminputcontextplugin.pro)
==============================================================================
--- /trunk/qt4/immodule/quiminputcontextplugin.pro (original)
+++ trunk/qt4/immodule/quiminputcontextplugin.pro.in Fri Sep 21 10:41:24 2007
@@ -3,11 +3,17 @@
######################################################################
TEMPLATE = lib
-DEPENDPATH += .
-INCLUDEPATH += . /usr/local/include/uim
-CONFIG += qt plugin thread
+INCLUDEPATH += @abs_top_builddir@ @abs_top_builddir@/uim
+CONFIG += qt plugin thread @QT_CONFIG_OPTS@
QT += qt3support
-LIBS += -luim
+LIBS += -luim -luim-scm
+
+QMAKE_LIBDIR += @abs_top_builddir@/uim
+QMAKE_CFLAGS_DEBUG += @CFLAGS@
+QMAKE_CFLAGS_RELEASE += @CFLAGS@
+QMAKE_CXXFLAGS_DEBUG += @CXXFLAGS@
+QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@
+
# Input
HEADERS += qhelpermanager.h \
@@ -29,3 +35,6 @@
qtextutil.cpp
TARGET = uiminputcontextplugin
+
+target.path += @[EMAIL PROTECTED]/inputmethods
+INSTALLS += target
