Revision: 7099
Author: nogu.dev
Date: Wed May 18 04:39:00 2011
Log: * po/Makevars
- (XGETTEXT_OPTIONS): Remove `--keyword=UIC_'.
* qt4/pref/uim-pref-qt4.pro.in
- (QMAKE_UIC): Use default $QMAKE_UIC.
* qt4/qtgettext.h
- Don't define UIC_().
http://code.google.com/p/uim/source/detail?r=7099
Modified:
/trunk/po/Makevars
/trunk/qt4/pref/uim-pref-qt4.pro.in
/trunk/qt4/qtgettext.h
=======================================
--- /trunk/po/Makevars Thu Aug 5 06:59:56 2010
+++ /trunk/po/Makevars Wed May 18 04:39:00 2011
@@ -8,7 +8,7 @@
top_builddir = ..
# These options get passed to xgettext.
-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=UIC_
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
# This is the copyright holder that gets inserted into the header of the
# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
=======================================
--- /trunk/qt4/pref/uim-pref-qt4.pro.in Wed May 18 04:38:37 2011
+++ /trunk/qt4/pref/uim-pref-qt4.pro.in Wed May 18 04:39:00 2011
@@ -6,8 +6,6 @@
INCLUDEPATH += @srcdir@/..
LIBS += -luim-custom -luim-counted-init @LIBINTL@
-QMAKE_UIC = $$QMAKE_UIC -tr UIC_
-
# Input
HEADERS += @srcdir@/customwidgets.h @srcdir@/qt4.h \
@srcdir@/keyeditformbase.h @srcdir@/olisteditformbase.h
=======================================
--- /trunk/qt4/qtgettext.h Thu Jan 6 18:09:56 2011
+++ /trunk/qt4/qtgettext.h Wed May 18 04:39:00 2011
@@ -47,7 +47,6 @@
#undef _
#endif
#define _(String) mygettext(String)
-#define UIC_(String, dummy) mygettext(String)
/* undef original N_(String) macro for handling encoding */
#ifdef N_
#undef N_
@@ -66,7 +65,6 @@
#undef _
#endif
#define _(String) mygettext(String)
-#define UIC_(String, dummy) (String)
#endif /* ENABLE_NLS */
#endif /* Not def: UIM_QT4_QTGETTEXT_H */
