[uim] r6387 committed - * configure.ac...

[codesite-noreply]

Revision: 6387
Author: nogu.dev
Date: Sat May 15 04:30:05 2010
Log: * configure.ac
  - Add qt4_immodule_option to define QT4_IMMODULE.
  - Expand tab to spaces.
* qt4/pref/customwidgets.cpp
  - (KeyGrabDialog::setKeyStr): Replace QT_IMMODULE with QT4_IMMODULE.
    Some keys are wrongly disabled due to this typo.
http://code.google.com/p/uim/source/detail?r=6387

Modified:
 /trunk/configure.ac
 /trunk/qt4/pref/customwidgets.cpp

=======================================
--- /trunk/configure.ac Sat May 15 04:29:55 2010
+++ /trunk/configure.ac Sat May 15 04:30:05 2010
@@ -1784,16 +1784,20 @@

 # Generate Makefiles for Qt4 by qmake
 if test x$use_qt4 = xyes; then
+    if test x$use_qt4_immodule = xyes; then
+        qt4_immodule_option="DEFINES+=QT4_IMMODULE"
+    fi
     ${QMAKE4} -o ${ac_abs_top_builddir}/qt4/candwin/Makefile.qmake \
-                ${ac_abs_top_builddir}/qt4/candwin/uim-candwin-qt4.pro
+        ${ac_abs_top_builddir}/qt4/candwin/uim-candwin-qt4.pro
     ${QMAKE4} -o ${ac_abs_top_builddir}/qt4/chardict/Makefile.qmake \
-                ${ac_abs_top_builddir}/qt4/chardict/uim-chardict-qt4.pro
+        ${ac_abs_top_builddir}/qt4/chardict/uim-chardict-qt4.pro
     ${QMAKE4} -o ${ac_abs_top_builddir}/qt4/pref/Makefile.qmake \
-                ${ac_abs_top_builddir}/qt4/pref/uim-pref-qt4.pro
+        ${qt4_immodule_option} \
+        ${ac_abs_top_builddir}/qt4/pref/uim-pref-qt4.pro
     ${QMAKE4} -o ${ac_abs_top_builddir}/qt4/switcher/Makefile.qmake \
-                ${ac_abs_top_builddir}/qt4/switcher/uim-im-switcher-qt4.pro
+        ${ac_abs_top_builddir}/qt4/switcher/uim-im-switcher-qt4.pro
     ${QMAKE4} -o ${ac_abs_top_builddir}/qt4/toolbar/Makefile.qmake \
-                ${ac_abs_top_builddir}/qt4/toolbar/uim-toolbar-qt4.pro
+        ${ac_abs_top_builddir}/qt4/toolbar/uim-toolbar-qt4.pro

     # Generate a Makefile for KDE4 applet by cmake
     if test x$use_applet_kde4 = xyes; then
=======================================
--- /trunk/qt4/pref/customwidgets.cpp   Sun May  2 07:29:42 2010
+++ /trunk/qt4/pref/customwidgets.cpp   Sat May 15 04:30:05 2010
@@ -982,7 +982,7 @@
     case Qt::Key_End:
         keystr += "end";
         break;
-#ifdef QT_IMMODULE
+#ifdef QT4_IMMODULE
     case Qt::Key_Multi_key:
         keystr += "Multi_key";
         break;
@@ -1139,7 +1139,7 @@
     case Qt::Key_Dead_Horn:
         keystr += "dead-horn";
         break;
-#endif /* Def: QT_IMMODULE */
+#endif /* Def: QT4_IMMODULE */
     case Qt::Key_Shift:
         keystr += "Shift_key";
         break;