summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/qt4.inc
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-qt/qt4/qt4.inc')
-rw-r--r--meta/recipes-qt/qt4/qt4.inc12
1 files changed, 9 insertions, 3 deletions
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 87a12e6607..ea868ff23c 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -15,7 +15,7 @@ QT_GLFLAGS ?= ""
15 15
16QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \ 16QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \
17 -shared -no-nas-sound -no-nis \ 17 -shared -no-nas-sound -no-nis \
18 -qt-gif -system-libjpeg -system-libpng -system-zlib \ 18 -system-libjpeg -system-libpng -system-zlib \
19 -no-pch -qdbus -stl -glib -phonon -webkit \ 19 -no-pch -qdbus -stl -glib -phonon -webkit \
20 -xmlpatterns -no-rpath -qt3support -silent \ 20 -xmlpatterns -no-rpath -qt3support -silent \
21 ${QT_SQL_DRIVER_FLAGS} \ 21 ${QT_SQL_DRIVER_FLAGS} \
@@ -160,7 +160,7 @@ FILES_${QT_BASE_NAME}-fonts-ttf-vera = "${libdir}/fonts/Vera*.ttf"
160FILES_${QT_BASE_NAME}-fonts-ttf-dejavu = "${libdir}/fonts/DejaVu*.ttf" 160FILES_${QT_BASE_NAME}-fonts-ttf-dejavu = "${libdir}/fonts/DejaVu*.ttf"
161FILES_${QT_BASE_NAME}-fonts-pfa = "${libdir}/fonts/*.pfa" 161FILES_${QT_BASE_NAME}-fonts-pfa = "${libdir}/fonts/*.pfa"
162FILES_${QT_BASE_NAME}-fonts-pfb = "${libdir}/fonts/*.pfb" 162FILES_${QT_BASE_NAME}-fonts-pfb = "${libdir}/fonts/*.pfb"
163FILES_${QT_BASE_NAME}-fonts-qpf = "${libdir}/fonts/*.qpf" 163FILES_${QT_BASE_NAME}-fonts-qpf = "${libdir}/fonts/*.qpf*"
164FILES_${QT_BASE_NAME}-fonts = "${libdir}/fonts/README ${libdir}/fonts/fontdir" 164FILES_${QT_BASE_NAME}-fonts = "${libdir}/fonts/README ${libdir}/fonts/fontdir"
165FILES_${QT_BASE_NAME}-linguist = "${bindir}/*linguist* ${bindir}/lrelease ${bindir}/lupdate ${bindir}/lconvert ${bindir}/qm2ts" 165FILES_${QT_BASE_NAME}-linguist = "${bindir}/*linguist* ${bindir}/lrelease ${bindir}/lupdate ${bindir}/lconvert ${bindir}/qm2ts"
166FILES_${QT_BASE_NAME}-linguist-dbg = "${bindir}/.debug/*linguist* ${bindir}/.debug/lrelease ${bindir}/.debug/lupdate ${bindir}/.debug/lconvert ${bindir}/.debug/qm2ts" 166FILES_${QT_BASE_NAME}-linguist-dbg = "${bindir}/.debug/*linguist* ${bindir}/.debug/lrelease ${bindir}/.debug/lupdate ${bindir}/.debug/lconvert ${bindir}/.debug/qm2ts"
@@ -190,7 +190,13 @@ do_configure() {
190 ln -sf linux-g++ mkspecs/${TARGET_OS}-oe-g++ 190 ln -sf linux-g++ mkspecs/${TARGET_OS}-oe-g++
191 fi 191 fi
192 192
193 cp -f ${WORKDIR}/g++.conf ${WORKDIR}/linux.conf mkspecs/common/ 193 if [ -f mkspecs/common/g++-unix.conf ] ; then
194 # mkspecs were refactored for 4.8.0
195 cp -f ${WORKDIR}/g++.conf mkspecs/common/g++-unix.conf
196 else
197 cp -f ${WORKDIR}/g++.conf mkspecs/common/g++.conf
198 fi
199 cp -f ${WORKDIR}/linux.conf mkspecs/common/
194 200
195 echo "[Paths]" > $QT_CONF_PATH 201 echo "[Paths]" > $QT_CONF_PATH
196 echo "Prefix=${prefix}/" >> $QT_CONF_PATH 202 echo "Prefix=${prefix}/" >> $QT_CONF_PATH