[oe-commits] org.oe.dev classes/qmake2, qtopia4core: Change the Qt include and library dir to match the new location/names

[freyther commit]

classes/qmake2,qtopia4core: Change the Qt include and library dir to match the new location/names

Author: freyther at openembedded.org
Branch: org.openembedded.dev
Revision: 7419f3f4f066b6e1983b8a290da3616101cbfeae
ViewMTN: http://monotone.openembedded.org/revision/info/7419f3f4f066b6e1983b8a290da3616101cbfeae
Files:
1
classes/qmake2.bbclass
classes/qtopia4core.bbclass
Diffs:

#
# mt diff -rf03475e57bbec2218b2417026ea908a9bbb569fc -r7419f3f4f066b6e1983b8a290da3616101cbfeae
#
# 
# 
# patch "classes/qmake2.bbclass"
#  from [4720a6ca5e41a1786e98f6876c83791801e04a1a]
#    to [e39087d1e996c0275d4d1042322770c53786f099]
# 
# patch "classes/qtopia4core.bbclass"
#  from [f05bb12d7e6296c2ea9e9656a44b1c93f5f0cf21]
#    to [b0b03ec4a695417498226c93ffaad9e3981c78fa]
# 
============================================================
--- classes/qmake2.bbclass	4720a6ca5e41a1786e98f6876c83791801e04a1a
+++ classes/qmake2.bbclass	e39087d1e996c0275d4d1042322770c53786f099
@@ -5,7 +5,6 @@ DEPENDS_prepend = "qmake2-native uicmoc4
 
 DEPENDS_prepend = "qmake2-native uicmoc4-native "
 
-export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt4"
 export QMAKESPEC = "${QTDIR}/mkspecs/${TARGET_OS}-oe-g++"
 export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic4"
 export OE_QMAKE_UIC3 = "${STAGING_BINDIR_NATIVE}/uic34"
@@ -14,7 +13,7 @@ export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}"
 export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/qmake2"
 export OE_QMAKE_LINK = "${CXX}"
 export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}"
-export OE_QMAKE_INCDIR_QT = "${QTDIR}/include"
-export OE_QMAKE_LIBDIR_QT = "${QTDIR}/lib"
+export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qt4"
+export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}/qt4"
 export OE_QMAKE_LIBS_QT = "qt"
 export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm"
============================================================
--- classes/qtopia4core.bbclass	f05bb12d7e6296c2ea9e9656a44b1c93f5f0cf21
+++ classes/qtopia4core.bbclass	b0b03ec4a695417498226c93ffaad9e3981c78fa
@@ -1,11 +1,11 @@ inherit qmake2
 DEPENDS_prepend = "${@["qtopia-core ", ""][(bb.data.getVar('PN', d, 1) == 'qtopia-core')]}"
 inherit qmake2
 
 #
 # override variables set by qmake-base to compile QtopiaCore apps
 #
-export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qtopiacore4"
-export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}/qtopiacore4/"
+export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qtopiacore"
+export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}/qtopiacore"
 export OE_QMAKE_LIBS_QT = "qt"
 export OE_QMAKE_LIBS_X11 = ""
 EXTRA_QMAKEVARS_POST += "LIBS+=-lQtNetwork "