Support Qt6 only. (#397)

Remove Qt5 support. Signed-off-by: Alexander Wenzel <[email protected]>
COVESA · Jan 17, 2024 · f891f5c · f891f5c
1 parent f0abe2b
commit f891f5c
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 152 deletions.
diff --git a/build_config.bat b/build_config.bat
@@ -4,43 +4,23 @@ echo ************************************
 
 echo *** Setting up environment ***
 
-REM Currently supported combinations by Qt installation
-REM 5.12.12 msvc2015,msvc2017
-REM 5.15.2 msvc2015,msvc2019
-REM 6.2.2 msvc2019
-
 if "%QTVER%"=="" (
-REM    set QTVER=5.12.12
-    set QTVER=5.15.2
-REM    set QTVER=6.4.1
-REM    set QTVER=6.2.2
+REM set QTVER=6.4.3
+REM set QTVER=6.5.3
+set QTVER=6.6.1
 )
 
 if "%MSVC_VER%"=="" (
-REM    set MSVC_VER=2015
-REM    set MSVC_VER=2017
     set MSVC_VER=2019
 )
 
-if "%MSVC_VER%"=="2015" (
-    if "%MSVC_DIR%"=="" set "MSVC_DIR=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC"
-) else (
-    if exist "C:\Program Files (x86)\Microsoft Visual Studio\%MSVC_VER%\Enterprise\VC\Auxiliary\Build" (
-        if "%MSVC_DIR%"=="" set "MSVC_DIR=C:\Program Files (x86)\Microsoft Visual Studio\%MSVC_VER%\Enterprise\VC\Auxiliary\Build"
-    ) else (
-        if "%MSVC_DIR%"=="" set "MSVC_DIR=C:\Program Files (x86)\Microsoft Visual Studio\%MSVC_VER%\BuildTools\VC\Auxiliary\Build"
-    )
+if "%MSVC_DIR%"=="" (
+	set "MSVC_DIR=C:\Program Files (x86)\Microsoft Visual Studio\%MSVC_VER%\BuildTools\VC\Auxiliary\Build"
 )
 
 echo Set QT directory for %QTVER% and %MSVC_VER%
 if "%QTDIR%"=="" (
     set QTDIR=C:\Qt\%QTVER%\msvc%MSVC_VER%_64
 )
 
-if "%QWT%"=="" (
-    set QWT=6.1.4
-REM    set QWT=6.1.6
-REM    set QWT=6.2.0
-)
-
 set PATH=%QTDIR%\bin;%MSVC_DIR%;%PATH%
diff --git a/build_parser_windows_qt5_MSVC.bat → build_parser_windows_MSVC.bat b/build_parser_windows_qt5_MSVC.bat → build_parser_windows_MSVC.bat
diff --git a/build_qwt_windows_qt5_MSVC.bat b/build_qwt_windows_qt5_MSVC.bat
diff --git a/build_sdk_windows_qt5_MSVC.bat → build_sdk_windows_MSVC.bat b/build_sdk_windows_qt5_MSVC.bat → build_sdk_windows_MSVC.bat
diff --git a/build_sdk_windows_qt5_MSVC_cmake.bat → build_sdk_windows_MSVC_cmake.bat b/build_sdk_windows_qt5_MSVC_cmake.bat → build_sdk_windows_MSVC_cmake.bat
diff --git a/...dk_windows_qt5_MSVC_cmake_interactive.bat → build_sdk_windows_MSVC_cmake_interactive.bat b/...dk_windows_qt5_MSVC_cmake_interactive.bat → build_sdk_windows_MSVC_cmake_interactive.bat
@@ -1,4 +1,4 @@
-call build_sdk_windows_qt5_MSVC_cmake.bat
+call build_sdk_windows_MSVC_cmake.bat
 SET RETCODE=%ERRORLEVEL%
 set /p name= Continue
 exit /b %RETCODE%
diff --git a/build_sdk_windows_qt5_MSVC_interactive.bat → build_sdk_windows_MSVC_interactive.bat b/build_sdk_windows_qt5_MSVC_interactive.bat → build_sdk_windows_MSVC_interactive.bat
@@ -1,4 +1,4 @@
-call build_sdk_windows_qt5_MSVC.bat
+call build_sdk_windows_MSVC.bat
 SET RETCODE=%ERRORLEVEL%
 set /p name= Continue
 exit /b %RETCODE%