Merge branch 'vuplus-1.6' of 192.168.102.66:/opt/repository/openembedded into vuplus-1.6

[vuplus_openembedded] / classes / qt4x11.bbclass

diff --git a/classes/qt4x11.bbclass b/classes/qt4x11.bbclass
index 923717f..abb1d9d 100644 (file)
--- a/classes/qt4x11.bbclass
+++ b/classes/qt4x11.bbclass
@@ -1,6 +1,9 @@
-DEPENDS_prepend = "${@["qt4x11 ", ""][(bb.data.getVar('PN', d, 1) == 'qt4-x11-free')]}"
+DEPENDS_prepend = "${@["qt4-x11-free ", ""][(bb.data.getVar('PN', d, 1)[:12] == 'qt4-x11-free')]}"
 
 inherit qmake2
 
+QT_DIR_NAME = "qt4"
+QT_LIBINFIX = ""
+
 # Qt4 uses atomic instructions not supported in thumb mode
 ARM_INSTRUCTION_SET = "arm"