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

3 files changed, 21 insertions, 21 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
diff --git a/qmake/qmake-native_3.2.3.oe b/qmake/qmake-native_3.2.3.oe
index 381c09ba97..da48f558b3 100644
--- a/qmake/qmake-native_3.2.3.oe
+++ b/qmake/qmake-native_3.2.3.oe
@@ -5,8 +5,7 @@ LICENSE = "GPL/QPL"
 
 SRC_URI = \
 	"ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-free-${PV}.tar.bz2 \
-	file://${FILESDIR}/linux-oe-qmake.conf \
-	file://${FILESDIR}/linux-oe-qplatformdefs.h"
+	file://${FILESDIR}/linux-oe-qmake.conf"
 
 S = "${WORKDIR}/qt-embedded-free-${PV}"
 
@@ -23,16 +22,16 @@ EXTRA_OEMAKE = "-e"
 
 do_configure() {
 	# Install the OE build templates (linux, linux-uclibc)
-	install -d ${S}/mkspecs/qws/linux-oe-g++
-	install -d ${S}/mkspecs/qws/linux-uclibc-oe-g++
+	install -d ${S}/mkspecs/linux-oe-g++
+	install -d ${S}/mkspecs/linux-uclibc-oe-g++
 	install -m 0644 ${WORKDIR}/linux-oe-qmake.conf \
-		${S}/mkspecs/qws/linux-oe-g++/qmake.conf
-	ln -s ../../linux-g++/qplatformdefs.h \
-		${S}/mkspecs/qws/linux-oe-g++/qplatformdefs.h
+		${S}/mkspecs/linux-oe-g++/qmake.conf
+	ln -s ../linux-g++/qplatformdefs.h \
+		${S}/mkspecs/linux-oe-g++/qplatformdefs.h
 	ln -s ../linux-oe-g++/qmake.conf \
-		${S}/mkspecs/qws/linux-uclibc-oe-g++/qmake.conf
-	ln -s ../../linux-g++/qplatformdefs.h \
-		${S}/mkspecs/qws/linux-uclibc-oe-g++/qplatformdefs.h
+		${S}/mkspecs/linux-uclibc-oe-g++/qmake.conf
+	ln -s ../linux-g++/qplatformdefs.h \
+		${S}/mkspecs/linux-uclibc-oe-g++/qplatformdefs.h
 
 	QMAKESPEC=
 	PLATFORM=${HOST_OS}-oe-g++