diff options
| author | Gerald Britton <gbritton@doomcom.org> | 2004-05-12 03:40:53 +0000 |
|---|---|---|
| committer | Gerald Britton <gbritton@doomcom.org> | 2004-05-12 03:40:53 +0000 |
| commit | d939f08ee4c97d90c5df6abb4f1952e60c928d9e (patch) | |
| tree | 52f4bb0ebce562c8a440885f3a3147ddfa353b86 /qmake/qmake-native-3.2.3 | |
| parent | 7439e4d76e8e9d1941cdf8f821cbe9622df1976e (diff) | |
Changes for new qmake.oeclass
- uicmoc-native,uicmoc3-native: use the qmake-base.oeclass to get just vars
and use those to generate appropriate qt config for build.
- qmake-native: updates for the new qmake.oeclass
- misc others: comment noting availability of new oeclass
BKrev: 40a19cc5EKcFkTs6PkSDRpLd_cuwwg
Diffstat (limited to 'qmake/qmake-native-3.2.3')
| -rw-r--r-- | qmake/qmake-native-3.2.3/linux-oe-qmake.conf | 23 | ||||
| -rw-r--r-- | qmake/qmake-native-3.2.3/linux-oe-qplatformdefs.h | 0 |
2 files changed, 12 insertions, 11 deletions
diff --git a/qmake/qmake-native-3.2.3/linux-oe-qmake.conf b/qmake/qmake-native-3.2.3/linux-oe-qmake.conf index c469416dcb..9dfb26a9cb 100644 --- a/qmake/qmake-native-3.2.3/linux-oe-qmake.conf +++ b/qmake/qmake-native-3.2.3/linux-oe-qmake.conf @@ -6,12 +6,12 @@ MAKEFILE_GENERATOR = UNIX TEMPLATE = app CONFIG += qt warn_on release -QMAKE_CC = $(OECC) +QMAKE_CC = $(OE_QMAKE_CC) QMAKE_LEX = flex QMAKE_LEXFLAGS = QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -pipe $(OECFLAGS) $(CFLAGS_EXTRA) +QMAKE_CFLAGS = -pipe $(OE_QMAKE_CFLAGS) $(CFLAGS_EXTRA) QMAKE_CFLAGS_WARN_ON = -Wall -W QMAKE_CFLAGS_WARN_OFF = QMAKE_CFLAGS_RELEASE = $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) @@ -20,8 +20,8 @@ QMAKE_CFLAGS_SHLIB = -fPIC QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses QMAKE_CFLAGS_THREAD = -D_REENTRANT -QMAKE_CXX = $(OECXX) -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -fno-exceptions -fno-rtti $(OECXXFLAGS) $(CXXFLAGS_EXTRA) +QMAKE_CXX = $(OE_QMAKE_CXX) +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -fno-exceptions -fno-rtti $(OE_QMAKE_CXXFLAGS) $(CXXFLAGS_EXTRA) QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE @@ -34,14 +34,14 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = QMAKE_LIBDIR_X11 = -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR) +QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR) QMAKE_INCDIR_OPENGL = QMAKE_LIBDIR_OPENGL = QMAKE_LINK = $(CXX) QMAKE_LINK_SHLIB = $(CXX) -QMAKE_LFLAGS = $(OELDFLAGS) $(LFLAGS_EXTRA) +QMAKE_LFLAGS = $(OE_QMAKE_LDFLAGS) $(LFLAGS_EXTRA) QMAKE_LFLAGS_RELEASE = QMAKE_LFLAGS_DEBUG = QMAKE_LFLAGS_SHLIB = -shared @@ -59,10 +59,10 @@ QMAKE_LIBS_QT_THREAD = -lqte-mt QMAKE_LIBS_QT_OPENGL = -lqgl QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $(QTDIR)/bin/moc -QMAKE_UIC = $(QTDIR)/bin/uic +QMAKE_MOC = $(OE_QMAKE_MOC) +QMAKE_UIC = $(OE_QMAKE_UIC) -QMAKE_AR = $(OEAR) cqs +QMAKE_AR = $(OE_QMAKE_AR) cqs QMAKE_RANLIB = QMAKE_TAR = tar -cf @@ -74,7 +74,8 @@ QMAKE_COPY_DIR = $(COPY) -r QMAKE_MOVE = mv -f QMAKE_DEL_FILE = rm -f QMAKE_DEL_DIR = rmdir -QMAKE_STRIP = $(OESTRIP) +QMAKE_STRIP = $(OE_QMAKE_STRIP) QMAKE_STRIPFLAGS_LIB += --strip-unneeded QMAKE_CHK_DIR_EXISTS = test -d QMAKE_MKDIR = mkdir -p + diff --git a/qmake/qmake-native-3.2.3/linux-oe-qplatformdefs.h b/qmake/qmake-native-3.2.3/linux-oe-qplatformdefs.h deleted file mode 100644 index e69de29bb2..0000000000 --- a/qmake/qmake-native-3.2.3/linux-oe-qplatformdefs.h +++ /dev/null |