From a0450530705ffaae1bbab318fb360f035d346629 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Mon, 21 Feb 2022 03:56:02 +0200 Subject: [PATCH 45/45] installer_cross: Update Qt6 include and plugin paths Those have changed in Crosser development version. Qt6 is not supported at all in the already releases crosser versions, so this does not affect those. See osdn #43937 Signed-off-by: Marko Lindqvist --- windows/installer_cross/installer_build.sh | 2 +- windows/installer_cross/winbuild.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/installer_cross/installer_build.sh b/windows/installer_cross/installer_build.sh index deafb835c1..5dc60f6ca2 100755 --- a/windows/installer_cross/installer_build.sh +++ b/windows/installer_cross/installer_build.sh @@ -82,7 +82,7 @@ add_qt5_env() { } add_qt6_env() { - cp -R $1/plugins $2/ && + cp -R $1/qt6/plugins $2/ && cp $1/bin/Qt6Core.dll $2/ && cp $1/bin/Qt6Gui.dll $2/ && cp $1/bin/Qt6Widgets.dll $2/ && diff --git a/windows/installer_cross/winbuild.sh b/windows/installer_cross/winbuild.sh index 07db73508d..9d36a0500c 100755 --- a/windows/installer_cross/winbuild.sh +++ b/windows/installer_cross/winbuild.sh @@ -151,7 +151,7 @@ if test "x$QTVER" = "xQt5" ; then QTPARAMS="--with-qtver=Qt5 --with-qt5-includes=${DLLSPATH}/include --with-qt5-libs=${DLLSPATH}/lib" MOC_CROSSER="${DLLSPATH}/bin/moc" elif test "x$QTVER" = "xQt6"; then - QTPARAMS="--with-qtver=Qt6 --with-qt6-includes=${DLLSPATH}/include --with-qt6-libs=${DLLSPATH}/lib" + QTPARAMS="--with-qtver=Qt6 --with-qt6-includes=${DLLSPATH}/qt6/include --with-qt6-libs=${DLLSPATH}/lib" MOC_CROSSER="${DLLSPATH}/linux/libexec/moc-qt6" fi -- 2.34.1