On 30.08.2015 15:30, Jonathan Liu wrote:
On 25/08/2015 9:43 PM, Samuli Piippo wrote:
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 <[email protected]>
---
classes/populate_sdk_qt5.bbclass | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/classes/populate_sdk_qt5.bbclass
b/classes/populate_sdk_qt5.bbclass
index d29ec36..3f33b23 100644
--- a/classes/populate_sdk_qt5.bbclass
+++ b/classes/populate_sdk_qt5.bbclass
@@ -4,10 +4,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
@@ -28,5 +24,7 @@ create_sdk_files_prepend () {
echo 'Examples =
${SDKTARGETSYSROOT}${OE_QMAKE_PATH_QT_EXAMPLES}' >> $qtconf
echo 'Tests = ${SDKTARGETSYSROOT}${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
}
This works but is it logically correct to use a directory that contains
binaries compiled for the target as the host data directory...?
The mkspecs are architecture independent but the plugins are target
specific.
Regards,
Jonathan
HostData doesn't seem to have other usages than finding mkspecs, at
least on Qt modules. When compiling Qt with external toolchain, HostData
and ArchData are the same, unless explicitly separated. Logically maybe
not the best, but I think it's still better than the symlink.
-samuli
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
