diff options
| author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-09-02 12:28:56 +0300 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-09-21 11:56:52 +0200 |
| commit | d44e7ee1f45e1701868adf49da9ccf7b02803952 (patch) | |
| tree | c577c174ef69edd8cec0f35d6a43a25c30c59fd2 | |
| parent | 9c1ac990f274e035f582d11df43068e2fc604f12 (diff) | |
qt5: add host paths to qt.conf
Add missing HostData and HostLibraries paths to qt.conf for qmake.
Using the target sysroot for the HostData, allows us to remove the
symbolic link for the mkspecs.
Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | classes/populate_sdk_qt5_base.bbclass | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/classes/populate_sdk_qt5_base.bbclass b/classes/populate_sdk_qt5_base.bbclass index 4a1eed3c..b6ce5967 100644 --- a/classes/populate_sdk_qt5_base.bbclass +++ b/classes/populate_sdk_qt5_base.bbclass @@ -2,10 +2,6 @@ inherit qmake5_paths create_sdk_files_prepend () { - # make a symbolic link to mkspecs for compatibility with QTCreator - (cd ${SDK_OUTPUT}/${SDKPATHNATIVE}; \ - ln -sf ${SDKTARGETSYSROOT}${libdir}/${QT_DIR_NAME}/mkspecs mkspecs;) - # Generate a qt.conf file to be deployed with the SDK qtconf=${SDK_OUTPUT}/${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}/qt.conf touch $qtconf @@ -26,6 +22,8 @@ create_sdk_files_prepend () { echo 'Examples = ${OE_QMAKE_PATH_QT_EXAMPLES}' >> $qtconf echo 'Tests = ${OE_QMAKE_PATH_QT_TESTS}' >> $qtconf echo 'HostPrefix = ${SDKPATHNATIVE}' >> $qtconf + echo 'HostData = ${SDKTARGETSYSROOT}${OE_QMAKE_PATH_QT_ARCHDATA}' >> $qtconf echo 'HostBinaries = ${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}' >> $qtconf + echo 'HostLibraries = ${SDKPATHNATIVE}${OE_QMAKE_PATH_LIBS}' >> $qtconf echo 'Sysroot = ${SDKTARGETSYSROOT}' >> $qtconf } |