Revision: 0956c392a408
Author: Muneyuki Noguchi <[email protected]>
Date: Wed May 30 07:20:33 2012
Log: Honor $CPPFLAGS in Qt4 helper tools and immodule.
* qt4/common.pro.in
- (QMAKE_CFLAGS_DEBUG, QMAKE_CFLAGS_RELEASE,
QMAKE_CXXFLAGS_DEBUG, QMAKE_CXXFLAGS_RELEASE): Add @CPPFLAGS@.
http://code.google.com/p/uim/source/detail?r=0956c392a408
Modified:
/qt4/common.pro.in
=======================================
--- /qt4/common.pro.in Sun Apr 15 06:43:16 2012
+++ /qt4/common.pro.in Wed May 30 07:20:33 2012
@@ -11,11 +11,11 @@
}
QMAKE_CC = @CC@
-QMAKE_CFLAGS_DEBUG += @CFLAGS@ @X_CFLAGS@
-QMAKE_CFLAGS_RELEASE += @CFLAGS@ @X_CFLAGS@
+QMAKE_CFLAGS_DEBUG += @CFLAGS@ @CPPFLAGS@ @X_CFLAGS@
+QMAKE_CFLAGS_RELEASE += @CFLAGS@ @CPPFLAGS@ @X_CFLAGS@
QMAKE_CXX = @CXX@
-QMAKE_CXXFLAGS_DEBUG += @CXXFLAGS@ @X_CFLAGS@
-QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@ @X_CFLAGS@
+QMAKE_CXXFLAGS_DEBUG += @CXXFLAGS@ @CPPFLAGS@ @X_CFLAGS@
+QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@ @CPPFLAGS@ @X_CFLAGS@
# Remove "-Wconversion" from CXXFLAGS to avoid lots of warnings
# from Qt4 header files
QMAKE_CXXFLAGS_DEBUG =
$$replace(QMAKE_CXXFLAGS_DEBUG, "-Wconversion", "")
