Revision: 6930
Author: ek.kato
Date: Mon Jan 31 23:56:57 2011
Log: * qt4/common.pro.in: Make link with -luim-x-util conditional.
* qt4/immodule/quiminputcontextplugin.pro.in : Make compiling
quiminputcontext_compose.o conditional.
http://code.google.com/p/uim/source/detail?r=6930
Modified:
/trunk/qt4/common.pro.in
/trunk/qt4/immodule/quiminputcontextplugin.pro.in
=======================================
--- /trunk/qt4/common.pro.in Sun Jan 2 23:05:19 2011
+++ /trunk/qt4/common.pro.in Mon Jan 31 23:56:57 2011
@@ -5,7 +5,10 @@
@abs_top_srcdir@/replace
QMAKE_LIBDIR += @abs_top_builddir@/uim @abs_top_builddir@/replace \
@abs_top_builddir@/replace/.libs
@abs_top_builddir@/uim/.libs
-LIBS += -lreplace -luim -luim-scm -luim-x-util
+LIBS += -lreplace -luim -luim-scm
+!win32:!embedded:!mac {
+ LIBS += -luim-x-util
+}
QMAKE_CC = @CC@
QMAKE_CFLAGS_DEBUG += @CFLAGS@ @X_CFLAGS@
=======================================
--- /trunk/qt4/immodule/quiminputcontextplugin.pro.in Sun Jan 2 23:04:42
2011
+++ /trunk/qt4/immodule/quiminputcontextplugin.pro.in Mon Jan 31 23:56:57
2011
@@ -15,7 +15,6 @@
@srcdir@/qtextutil.h \
@srcdir@/quiminfomanager.h \
@srcdir@/quiminputcontext.h \
- @srcdir@/quiminputcontext_compose.h \
@srcdir@/subwindow.h
SOURCES += @srcdir@/abstractcandidatewindow.cpp \
@@ -27,9 +26,13 @@
@srcdir@/qtextutil.cpp \
@srcdir@/quiminfomanager.cpp \
@srcdir@/quiminputcontext.cpp \
- @srcdir@/quiminputcontext_compose.cpp \
@srcdir@/subwindow.cpp
+!win32:!embedded:!mac {
+ HEADERS += @srcdir@/quiminputcontext_compose.h
+ SOURCES += @srcdir@/quiminputcontext_compose.cpp
+}
+
TARGET = uiminputcontextplugin
target.path += @DESTDIR@$$[QT_INSTALL_PLUGINS]/inputmethods
