aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2015-08-23 23:55:58 +1000
committerMartin Jansa <Martin.Jansa@gmail.com>2015-08-26 17:12:26 +0200
commitb758a8f6600c1f4ca38df559fc4be6bd3ad53624 (patch)
tree5693244256a496e6e872ce32c187eb1ef1f0bb94
parent97ce05c0b2a81f05388d7f727741529fb9177775 (diff)
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 <net147@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--classes/populate_sdk_qt5.bbclass31
1 files changed, 16 insertions, 15 deletions
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"