Revision: 6881
Author: nogu.dev
Date: Sun Jan 2 23:04:42 2011
Log: * configure.ac
- (AC_CONFIG_FILES): Add qt4/common.pro.
* qt4/Makefile.am
- (EXTRA_DIST): Add common.pro.in.
* qt4/common.pro.in
- New file.
* qt4/candwin/uim-candwin-qt4.pro.in
* qt4/chardict/uim-chardict-qt4.pro.in
* qt4/immodule/quiminputcontextplugin.pro.in
* qt4/pref/uim-pref-qt4.pro.in
* qt4/switcher/uim-im-switcher-qt4.pro.in
* qt4/toolbar/uim-toolbar-qt4.pro.in
- Include qt4/common.pro.in.
http://code.google.com/p/uim/source/detail?r=6881
Added:
/trunk/qt4/common.pro.in
Modified:
/trunk/configure.ac
/trunk/qt4/Makefile.am
/trunk/qt4/candwin/uim-candwin-qt4.pro.in
/trunk/qt4/chardict/uim-chardict-qt4.pro.in
/trunk/qt4/immodule/quiminputcontextplugin.pro.in
/trunk/qt4/pref/uim-pref-qt4.pro.in
/trunk/qt4/switcher/uim-im-switcher-qt4.pro.in
/trunk/qt4/toolbar/uim-toolbar-qt4.pro.in
=======================================
--- /dev/null
+++ /trunk/qt4/common.pro.in Sun Jan 2 23:04:42 2011
@@ -0,0 +1,23 @@
+CONFIG += @QT_CONFIG_OPTS@
+
+INCLUDEPATH += @abs_top_builddir@ @abs_top_builddir@/uim \
+ @abs_top_srcdir@ @abs_top_srcdir@/uim \
+ @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
+
+QMAKE_CC = @CC@
+QMAKE_CFLAGS_DEBUG += @CFLAGS@ @X_CFLAGS@
+QMAKE_CFLAGS_RELEASE += @CFLAGS@ @X_CFLAGS@
+QMAKE_CXX = @CXX@
+QMAKE_CXXFLAGS_DEBUG += @CXXFLAGS@ @X_CFLAGS@
+QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@ @X_CFLAGS@
+# Remove "-Wconversion" from CXXFLAGS to avoid lots of warnings
+# from Qt4 header files
+QMAKE_CXXFLAGS_DEBUG =
$$replace(QMAKE_CXXFLAGS_DEBUG, "-Wconversion", "")
+QMAKE_CXXFLAGS_RELEASE =
$$replace(QMAKE_CXXFLAGS_RELEASE, "-Wconversion", "")
+
+QMAKE_STRIP =
+
+INSTALLS += target
=======================================
--- /trunk/configure.ac Thu Sep 9 04:50:34 2010
+++ /trunk/configure.ac Sun Jan 2 23:04:42 2011
@@ -1823,6 +1823,7 @@
qt/test/Makefile
qt/uimapplet.desktop
qt4/Makefile
+ qt4/common.pro
qt4/candwin/Makefile
qt4/candwin/uim-candwin-qt4.pro
qt4/chardict/Makefile
=======================================
--- /trunk/qt4/Makefile.am Sat Sep 26 11:30:24 2009
+++ /trunk/qt4/Makefile.am Sun Jan 2 23:04:42 2011
@@ -1,3 +1,4 @@
SUBDIRS = candwin chardict edittest immodule pref switcher toolbar
-EXTRA_DIST = qtgettext.h
+EXTRA_DIST = qtgettext.h \
+ common.pro.in
=======================================
--- /trunk/qt4/candwin/uim-candwin-qt4.pro.in Sat Aug 7 20:31:59 2010
+++ /trunk/qt4/candwin/uim-candwin-qt4.pro.in Sun Jan 2 23:04:42 2011
@@ -1,23 +1,9 @@
+include(../common.pro)
+
TEMPLATE = app
-CONFIG += @QT_CONFIG_OPTS@
-
-INCLUDEPATH += @top_builddir@ @top_builddir@/uim \
- @top_srcdir@ @top_srcdir@/uim \
- @top_srcdir@/replace @srcdir@/..
-QMAKE_LIBDIR += @abs_top_builddir@/uim
-QMAKE_LIBDIR += @abs_top_builddir@/replace
-QMAKE_LIBDIR += @abs_top_builddir@/uim/.libs
-QMAKE_LIBDIR += @abs_top_builddir@/replace/.libs
-LIBS += -lreplace -luim -luim-scm -luim-x-util @LIBINTL@
-
-QMAKE_CC = @CC@
-QMAKE_CFLAGS_DEBUG += @CFLAGS@ @X_CFLAGS@
-QMAKE_CFLAGS_RELEASE += @CFLAGS@ @X_CFLAGS@
-QMAKE_CXX = @CXX@
-QMAKE_CXXFLAGS_DEBUG += @CXXFLAGS@ @X_CFLAGS@
-QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@ @X_CFLAGS@
-
-QMAKE_STRIP =
+INCLUDEPATH += @srcdir@/..
+
+LIBS += @LIBINTL@
# Input
HEADERS += @srcdir@/qt4.h
@@ -26,4 +12,3 @@
TARGET = uim-candwin-qt4
target.path += @DESTDIR@@UIM_LIBEXECDIR@
-INSTALLS += target
=======================================
--- /trunk/qt4/chardict/uim-chardict-qt4.pro.in Sat Aug 7 20:31:59 2010
+++ /trunk/qt4/chardict/uim-chardict-qt4.pro.in Sun Jan 2 23:04:42 2011
@@ -1,23 +1,6 @@
-TEMPLATE = app
-CONFIG += @QT_CONFIG_OPTS@
-
-INCLUDEPATH += @top_builddir@ @top_builddir@/uim \
- @top_srcdir@ @top_srcdir@/uim \
- @top_srcdir@/replace
-QMAKE_LIBDIR += @abs_top_builddir@/uim
-QMAKE_LIBDIR += @abs_top_builddir@/replace
-QMAKE_LIBDIR += @abs_top_builddir@/uim/.libs
-QMAKE_LIBDIR += @abs_top_builddir@/replace/.libs
-LIBS += -lreplace -luim -luim-scm -luim-x-util @LIBINTL@ @X11_LIBS@
-
-QMAKE_CC = @CC@
-QMAKE_CFLAGS_DEBUG += @CFLAGS@ @X_CFLAGS@
-QMAKE_CFLAGS_RELEASE += @CFLAGS@ @X_CFLAGS@
-QMAKE_CXX = @CXX@
-QMAKE_CXXFLAGS_DEBUG += @CXXFLAGS@ @X_CFLAGS@
-QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@ @X_CFLAGS@
-
-QMAKE_STRIP =
+include(../common.pro)
+
+LIBS += @LIBINTL@ @X11_LIBS@
# Input
HEADERS += @srcdir@/bushuviewwidget.h \
@@ -35,4 +18,3 @@
TARGET = uim-chardict-qt4
target.path += @DESTDIR@@exec_prefix@/bin
-INSTALLS += target
=======================================
--- /trunk/qt4/immodule/quiminputcontextplugin.pro.in Sat Aug 7 20:31:59
2010
+++ /trunk/qt4/immodule/quiminputcontextplugin.pro.in Sun Jan 2 23:04:42
2011
@@ -1,29 +1,9 @@
-######################################################################
-# Automatically generated by qmake (1.08a) Mon Aug 23 21:35:01 2004
-######################################################################
+include(../common.pro)
TEMPLATE = lib
-CONFIG += plugin @QT_CONFIG_OPTS@
-
-INCLUDEPATH += @top_builddir@ @top_builddir@/uim \
- @top_srcdir@ @top_srcdir@/uim \
- @top_srcdir@/replace
-QMAKE_LIBDIR += @abs_top_builddir@/uim
-QMAKE_LIBDIR += @abs_top_builddir@/replace
-# Since the plugin linked with libtool did not work, link the
-# static libraries directly
-QMAKE_LIBDIR += @abs_top_builddir@/replace/.libs
-QMAKE_LIBDIR += @abs_top_builddir@/uim/.libs
-LIBS += -lreplace -luim -luim-scm -luim-x-util @X11_LIBS@
-
-QMAKE_CC = @CC@
-QMAKE_CFLAGS_DEBUG += @CFLAGS@ @X_CFLAGS@
-QMAKE_CFLAGS_RELEASE += @CFLAGS@ @X_CFLAGS@
-QMAKE_CXX = @CXX@
-QMAKE_CXXFLAGS_DEBUG += @CXXFLAGS@ @X_CFLAGS@
-QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@ @X_CFLAGS@
-
-QMAKE_STRIP =
+CONFIG += plugin
+
+LIBS += @X11_LIBS@
# Input
HEADERS += @srcdir@/abstractcandidatewindow.h \
@@ -53,4 +33,3 @@
TARGET = uiminputcontextplugin
target.path += @dest...@$$[qt_install_plugins]/inputmethods
-INSTALLS += target
=======================================
--- /trunk/qt4/pref/uim-pref-qt4.pro.in Sat Aug 7 20:31:59 2010
+++ /trunk/qt4/pref/uim-pref-qt4.pro.in Sun Jan 2 23:04:42 2011
@@ -1,23 +1,10 @@
+include(../common.pro)
+
TEMPLATE = app
-CONFIG += @QT_CONFIG_OPTS@
-
-INCLUDEPATH += @top_builddir@ @top_builddir@/uim \
- @top_srcdir@ @top_srcdir@/uim \
- @top_srcdir@/replace @srcdir@/..
-QMAKE_LIBDIR += @abs_top_builddir@/uim
-QMAKE_LIBDIR += @abs_top_builddir@/replace
-QMAKE_LIBDIR += @abs_top_builddir@/uim/.libs
-QMAKE_LIBDIR += @abs_top_builddir@/replace/.libs
-LIBS += -lreplace -luim -luim-scm -luim-x-util -luim-custom
-luim-counted-init @LIBINTL@
-
-QMAKE_CC = @CC@
-QMAKE_CFLAGS_DEBUG += @CFLAGS@ @X_CFLAGS@
-QMAKE_CFLAGS_RELEASE += @CFLAGS@ @X_CFLAGS@
-QMAKE_CXX = @CXX@
-QMAKE_CXXFLAGS_DEBUG += @CXXFLAGS@ @X_CFLAGS@
-QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@ @X_CFLAGS@
-
-QMAKE_STRIP =
+
+INCLUDEPATH += @srcdir@/..
+LIBS += -luim-custom -luim-counted-init @LIBINTL@
+
QMAKE_UIC = $$QMAKE_UIC -tr UIC_
# Input
@@ -28,4 +15,3 @@
TARGET = uim-pref-qt4
target.path += @DESTDIR@@exec_prefix@/bin
-INSTALLS += target
=======================================
--- /trunk/qt4/switcher/uim-im-switcher-qt4.pro.in Sat Aug 7 20:31:59 2010
+++ /trunk/qt4/switcher/uim-im-switcher-qt4.pro.in Sun Jan 2 23:04:42 2011
@@ -1,24 +1,10 @@
+include(../common.pro)
+
TEMPLATE = app
-CONFIG += @QT_CONFIG_OPTS@
-
-INCLUDEPATH += @top_builddir@ @top_builddir@/uim \
- @top_srcdir@ @top_srcdir@/uim \
- @top_srcdir@/replace @srcdir@/..
-QMAKE_LIBDIR += @abs_top_builddir@/uim
-QMAKE_LIBDIR += @abs_top_builddir@/replace
-QMAKE_LIBDIR += @abs_top_builddir@/uim/.libs
-QMAKE_LIBDIR += @abs_top_builddir@/replace/.libs
+
+INCLUDEPATH += @srcdir@/..
LIBS += -lreplace -luim -luim-scm -luim-custom @LIBINTL@
-QMAKE_CC = @CC@
-QMAKE_CFLAGS_DEBUG += @CFLAGS@ @X_CFLAGS@
-QMAKE_CFLAGS_RELEASE += @CFLAGS@ @X_CFLAGS@
-QMAKE_CXX = @CXX@
-QMAKE_CXXFLAGS_DEBUG += @CXXFLAGS@ @X_CFLAGS@
-QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@ @X_CFLAGS@
-
-QMAKE_STRIP =
-
# Input
HEADERS += @srcdir@/qt4.h
SOURCES += @srcdir@/qt4.cpp
@@ -26,4 +12,3 @@
TARGET = uim-im-switcher-qt4
target.path += @DESTDIR@@exec_prefix@/bin
-INSTALLS += target
=======================================
--- /trunk/qt4/toolbar/uim-toolbar-qt4.pro.in Sat Aug 7 20:31:59 2010
+++ /trunk/qt4/toolbar/uim-toolbar-qt4.pro.in Sun Jan 2 23:04:42 2011
@@ -1,23 +1,9 @@
+include(../common.pro)
+
TEMPLATE = app
-CONFIG += @QT_CONFIG_OPTS@
-
-INCLUDEPATH += @top_builddir@ @top_builddir@/uim \
- @top_srcdir@ @top_srcdir@/uim \
- @top_srcdir@/replace @srcdir@/..
-QMAKE_LIBDIR += @abs_top_builddir@/uim
-QMAKE_LIBDIR += @abs_top_builddir@/replace
-QMAKE_LIBDIR += @abs_top_builddir@/uim/.libs
-QMAKE_LIBDIR += @abs_top_builddir@/replace/.libs
-LIBS += -lreplace -luim -luim-scm -luim-x-util @LIBINTL@
-
-QMAKE_CC = @CC@
-QMAKE_CFLAGS_DEBUG += @CFLAGS@ @X_CFLAGS@
-QMAKE_CFLAGS_RELEASE += @CFLAGS@ @X_CFLAGS@
-QMAKE_CXX = @CXX@
-QMAKE_CXXFLAGS_DEBUG += @CXXFLAGS@ @X_CFLAGS@
-QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@ @X_CFLAGS@
-
-QMAKE_STRIP =
+
+INCLUDEPATH += @srcdir@/..
+LIBS += @LIBINTL@
# Input
HEADERS += @srcdir@/common-quimhelpertoolbar.h \
@@ -30,4 +16,3 @@
TARGET = uim-toolbar-qt4
target.path += @DESTDIR@@exec_prefix@/bin
-INSTALLS += target
