From b758a8f6600c1f4ca38df559fc4be6bd3ad53624 Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Sun, 23 Aug 2015 23:55:58 +1000 Subject: populate_sdk_qt5.bbclass: set paths correctly in qt.conf Set paths correctly in qt.conf so that $$[QT_SYSROOT] and $$[QT_INSTALL_PREFIX] can be used from qmake. Signed-off-by: Jonathan Liu Signed-off-by: Martin Jansa --- classes/populate_sdk_qt5.bbclass | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) (limited to 'classes') diff --git a/classes/populate_sdk_qt5.bbclass b/classes/populate_sdk_qt5.bbclass index 79df4890..149a448c 100644 --- a/classes/populate_sdk_qt5.bbclass +++ b/classes/populate_sdk_qt5.bbclass @@ -15,23 +15,24 @@ create_sdk_files_prepend () { qtconf=${SDK_OUTPUT}/${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}/qt.conf touch $qtconf echo '[Paths]' >> $qtconf - echo 'Prefix = ${SDKTARGETSYSROOT}' >> $qtconf - echo 'Headers = ${SDKTARGETSYSROOT}${OE_QMAKE_PATH_QT_HEADERS}' >> $qtconf - echo 'Libraries = ${SDKTARGETSYSROOT}${OE_QMAKE_PATH_LIBS}' >> $qtconf - echo 'ArchData = ${SDKTARGETSYSROOT}${OE_QMAKE_PATH_QT_ARCHDATA}' >> $qtconf - echo 'Data = ${SDKTARGETSYSROOT}${OE_QMAKE_PATH_QT_DATA}' >> $qtconf - echo 'Binaries = ${SDKTARGETSYSROOT}${OE_QMAKE_PATH_QT_BINS}' >> $qtconf - echo 'LibraryExecutables = ${SDKTARGETSYSROOT}${OE_QMAKE_PATH_LIBEXECS}' >> $qtconf - echo 'Plugins = ${SDKTARGETSYSROOT}${OE_QMAKE_PATH_PLUGINS}' >> $qtconf - echo 'Imports = ${SDKTARGETSYSROOT}${OE_QMAKE_PATH_IMPORTS}' >> $qtconf - echo 'Qml2Imports = ${SDKTARGETSYSROOT}${OE_QMAKE_PATH_QML}' >> $qtconf - echo 'Translations = ${SDKTARGETSYSROOT}${OE_QMAKE_PATH_QT_TRANSLATIONS}' >> $qtconf - echo 'Documentation = ${SDKTARGETSYSROOT}${OE_QMAKE_PATH_QT_DOCS}' >> $qtconf - echo 'Settings = ${SDKTARGETSYSROOT}${OE_QMAKE_PATH_QT_SETTINGS}' >> $qtconf - echo 'Examples = ${SDKTARGETSYSROOT}${OE_QMAKE_PATH_QT_EXAMPLES}' >> $qtconf - echo 'Tests = ${SDKTARGETSYSROOT}${OE_QMAKE_PATH_QT_TESTS}' >> $qtconf + echo 'Prefix = ${OE_QMAKE_PATH_PREFIX}' >> $qtconf + echo 'Headers = ${OE_QMAKE_PATH_QT_HEADERS}' >> $qtconf + echo 'Libraries = ${OE_QMAKE_PATH_LIBS}' >> $qtconf + echo 'ArchData = ${OE_QMAKE_PATH_QT_ARCHDATA}' >> $qtconf + echo 'Data = ${OE_QMAKE_PATH_QT_DATA}' >> $qtconf + echo 'Binaries = ${OE_QMAKE_PATH_QT_BINS}' >> $qtconf + echo 'LibraryExecutables = ${OE_QMAKE_PATH_LIBEXECS}' >> $qtconf + echo 'Plugins = ${OE_QMAKE_PATH_PLUGINS}' >> $qtconf + echo 'Imports = ${OE_QMAKE_PATH_IMPORTS}' >> $qtconf + echo 'Qml2Imports = ${OE_QMAKE_PATH_QML}' >> $qtconf + echo 'Translations = ${OE_QMAKE_PATH_QT_TRANSLATIONS}' >> $qtconf + echo 'Documentation = ${OE_QMAKE_PATH_QT_DOCS}' >> $qtconf + echo 'Settings = ${OE_QMAKE_PATH_QT_SETTINGS}' >> $qtconf + echo 'Examples = ${OE_QMAKE_PATH_QT_EXAMPLES}' >> $qtconf + echo 'Tests = ${OE_QMAKE_PATH_QT_TESTS}' >> $qtconf echo 'HostPrefix = ${SDKPATHNATIVE}' >> $qtconf echo 'HostBinaries = ${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}' >> $qtconf + echo 'Sysroot = ${SDKTARGETSYSROOT}' >> $qtconf } FEATURE_PACKAGES_qtcreator-debug = "packagegroup-qt5-qtcreator-debug" -- cgit v1.2.3