Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

core.pro: use QT6_INSTALL_LIBDIR when provided #20

Merged
merged 1 commit into from Nov 1, 2023

Conversation

Tofee
Copy link
Contributor

@Tofee Tofee commented Oct 21, 2023

When using meta-qt6 on Yocto, the QT_INSTALL_LIBS points to the host folder for Qt6 libs install.

On device we end up with sensorfwd looking in a directory like this:

/media/LuneOS/testing/webos-ports/tmp-glibc/work/pinephone-webos-linux/sensorfw/0.14.4+gitAUTOINC+24ab29a7b7-r0/recipe-sysroot/usr/lib/sensord-qt6

To avoid that, make it possible to use an alternative qmake variable named QT6_INSTALL_LIBDIR when its value is defined by the build toolchain.

When using meta-qt6 on Yocto, the QT_INSTALL_LIBS points to the host folder
for Qt6 libs install.

On device we end up with sensorfwd looking in a directory like this:
/media/LuneOS/testing/webos-ports/tmp-glibc/work/pinephone-webos-linux/sensorfw/0.14.4+gitAUTOINC+24ab29a7b7-r0/recipe-sysroot/usr/lib/sensord-qt6

To avoid that, make it possible to use an alternative qmake variable
named QT6_INSTALL_LIBDIR when its value is defined by the build toolchain.

Signed-off-by: Christophe Chapuis <chris.chapuis@gmail.com>
@Tofee
Copy link
Contributor Author

Tofee commented Oct 21, 2023

@Herrie82 FYI

Copy link
Contributor

@mlehtima mlehtima left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems reasonable

@Herrie82
Copy link
Contributor

@rainemak Looks good to me too :)

@rainemak rainemak merged commit c906ea7 into sailfishos:master Nov 1, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants