From d7574cf1eb54b4a30e0cedaedcd599edf68027aa Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Fri, 19 Nov 2021 10:28:53 +0100 Subject: [PATCH] use qt5 as qt6 breaks some functionality --- resources/scripts/github-actions/build-windows.ps1 | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/resources/scripts/github-actions/build-windows.ps1 b/resources/scripts/github-actions/build-windows.ps1 index 77fc93ff9..6fa06672b 100755 --- a/resources/scripts/github-actions/build-windows.ps1 +++ b/resources/scripts/github-actions/build-windows.ps1 @@ -61,8 +61,16 @@ $maria_path = "$old_pwd\mariadb-$maria_version-winx64" $qt_sqldrivers_path = "$qt_path\$qt_version\Src\qtbase\src\plugins\sqldrivers" cd "$qt_sqldrivers_path" -& $cmake_path -G Ninja -DCMAKE_BUILD_TYPE="Release" -DMySQL_INCLUDE_DIR="$maria_path\include\mysql" -DMySQL_LIBRARY="$maria_path\lib\libmariadb.lib" -& $cmake_path --build . + +if ($qt_version.StartsWith("6")) { + & $cmake_path -G Ninja -DCMAKE_BUILD_TYPE="Release" -DMySQL_INCLUDE_DIR="$maria_path\include\mysql" -DMySQL_LIBRARY="$maria_path\lib\libmariadb.lib" + & $cmake_path --build . +} +else { + & $qt_qmake -- MYSQL_INCDIR="$maria_path\include\mysql" MYSQL_LIBDIR="$maria_path\lib" + nmake.exe sub-mysql +} + cd "$old_pwd" # Build application.