From 55b1e7b186f2eeb3047ef5d093cb3df30e4baf92 Mon Sep 17 00:00:00 2001 From: Dave Page Date: Mon, 10 Jul 2017 12:12:25 +0100 Subject: [PATCH] Update Mingw build for changes in QtWebKit --- Make-MinGW.bat | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/Make-MinGW.bat b/Make-MinGW.bat index 811de6d72..66e5e4db0 100644 --- a/Make-MinGW.bat +++ b/Make-MinGW.bat @@ -256,10 +256,19 @@ REM Main function Ends IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL% copy "%QTDIR%\bin\Qt5MultimediaWidgets.dll" "%PGBUILDPATH%\runtime" IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL% - copy "%QTDIR%\bin\libQt5WebKit.dll" "%PGBUILDPATH%\runtime" - IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL% - copy "%QTDIR%\bin\libQt5WebKitWidgets.dll" "%PGBUILDPATH%\runtime" - IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL% + + IF %QT_VERSION% GEQ 5.9 ( + copy "%QTDIR%\bin\Qt5WebKit.dll" "%PGBUILDPATH%\runtime" + IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL% + copy "%QTDIR%\bin\Qt5WebKitWidgets.dll" "%PGBUILDPATH%\runtime" + IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL% + ) ELSE ( + copy "%QTDIR%\bin\libQt5WebKit.dll" "%PGBUILDPATH%\runtime" + IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL% + copy "%QTDIR%\bin\libQt5WebKitWidgets.dll" "%PGBUILDPATH%\runtime" + IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL% + ) + copy "%QTDIR%\bin\icudt57.dll" "%PGBUILDPATH%\runtime" IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL% copy "%QTDIR%\bin\icuin57.dll" "%PGBUILDPATH%\runtime" @@ -268,13 +277,13 @@ REM Main function Ends IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL% copy "%QTDIR%\bin\libgcc_s_dw2-1.dll" "%PGBUILDPATH%\runtime" IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL% - copy "%QTDIR%\bin\libstdc++-6.dll" "%PGBUILDPATH%\runtime" + copy "%QTDIR%\bin\libstdc++-6.dll" "%PGBUILDPATH%\runtime" IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL% - copy "%QTDIR%\bin\libwinpthread-1.dll" "%PGBUILDPATH%\runtime" + copy "%QTDIR%\bin\libwinpthread-1.dll" "%PGBUILDPATH%\runtime" IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL% - copy "%QTDIR%\bin\libxml2-2.dll" "%PGBUILDPATH%\runtime" + copy "%QTDIR%\bin\libxml2-2.dll" "%PGBUILDPATH%\runtime" IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL% - copy "%QTDIR%\bin\libxslt-1.dll" "%PGBUILDPATH%\runtime" + copy "%QTDIR%\bin\libxslt-1.dll" "%PGBUILDPATH%\runtime" IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL% MKDIR "%PGBUILDPATH%\runtime\platforms" IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%