Merge pull request #7 from levonmaa/master
Fix up prl and pkgconfig file generation and paths for the qt.conf
This commit is contained in:
commit
22b5908bfe
|
@ -21,7 +21,7 @@ do_generate_qt_config_file() {
|
||||||
Binaries = ${bindir}
|
Binaries = ${bindir}
|
||||||
Headers = ${STAGING_INCDIR}/qt5
|
Headers = ${STAGING_INCDIR}/qt5
|
||||||
Plugins = ${libdir}/qt5/plugins
|
Plugins = ${libdir}/qt5/plugins
|
||||||
Libraries = ${libdir}
|
Libraries = ${STAGING_LIBDIR}
|
||||||
Imports = ${datadir}/qt5/imports
|
Imports = ${datadir}/qt5/imports
|
||||||
Qml2Imports = ${libdir}/qt5/qml
|
Qml2Imports = ${libdir}/qt5/qml
|
||||||
Documentation=${docdir}/qt5
|
Documentation=${docdir}/qt5
|
||||||
|
|
|
@ -53,6 +53,11 @@ do_configure_append() {
|
||||||
${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/features/qt_installs.prf
|
${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/features/qt_installs.prf
|
||||||
rm -rf ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/modules*
|
rm -rf ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/modules*
|
||||||
|
|
||||||
|
### Fix up prl and pkgconfig lib paths, by default they will point to /usr/lib
|
||||||
|
${OE_QMAKE_QMAKE} -set OE_CROSS_INSTALL_LIBS ${STAGING_LIBDIR}
|
||||||
|
sed -i 's/QT_INSTALL_LIBS\/raw/OE_CROSS_INSTALL_LIBS/g' mkspecs/features/qt_module.prf
|
||||||
|
sed -i 's/QT_INSTALL_LIBS\/raw/OE_CROSS_INSTALL_LIBS/g' ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/features/qt_module.prf
|
||||||
|
|
||||||
### Remove the old pri files
|
### Remove the old pri files
|
||||||
rm ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/*.pri
|
rm ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/*.pri
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue