Prepare Qt6 build

INSTALL.md

@@ -4,8 +4,8 @@ Alexander Wenzel <Alexander.AW.Wenzel@bmw.de>
 
 ## Instructions for installing DLT Viewer (GUI)
 
-* Install Qt5 SDK including Qt Creator and Microsoft Visual Studio Build Tools 2017
-* Tested with QT 5.15.2 (Windows) and Qt 5.12.8 (Ubuntu 20.04LTS Linux)
+* Install Qt5 SDK and Qt6 SDK including Qt Creator and Microsoft Visual Studio Build Tools 2019
+* Tested with QT 5.15.2 (Windows), QT 5.6.1 (Windows), and Qt 5.12.8 (Ubuntu 20.04LTS Linux)
 * Open project BuildDltViewer.pro in Qt Creator.
 * Ensure that build options point to correct QT and MSVC.
 * Build Release in Qt Creator or via CMake (see last).
@@ -27,23 +27,12 @@ Alexander Wenzel <Alexander.AW.Wenzel@bmw.de>
 
 ## Build DLT Viewer in Windows
 
-* Install Qt5 SDK and Microsoft Visual Studio Build Tools 2019
-* If needed adapt you configuration in build_sdk_windows_qt5_MSVC.bat
-* Run build_sdk_windows_qt5_MSVC.bat
+* Install Qt5 SDK or Qt6 SDK and Microsoft Visual Studio Build Tools 2019
+* If needed adapt you configuration in build_config.bat
+* Run build_sdk_windows_qt5_MSVC_interactive.bat
 
 The DLT Viewer will be installed by default in C:\DltViewerSDK
 
-## Optional: Prepare Installation Qwt (Windows)
-
-Some DLT Viewer plugins will use the Qwt library for displaying graphs.
-The Qwt library must be compiled and installed before it can be used.
-
-(Tested with Qwt 6.1.6)
-
-* Install Qt5 SDK and Microsoft Visual Studio Build Tools 2019
-* Copy Qwt zip package qwt-6.1.6.zip to DLT Viewer folder
-* Run build_qwt_windows_qt5_MSVC.bat
-
 ## Create SDK (Linux)
 
 * Compile DLT Viewer as described in "Build DLT-viewer Linux"

README.md

@@ -35,8 +35,9 @@ See INSTALL.txt regarding doxygen API documentation generation.
 
 ## Software/Hardware
 
-Developed with QT 5 (http://qt-project.org/)
-Tested with Windows 10 + Qt 5.12.12 + Microsoft Visual Studio Build Tools 2017
+Developed with QT5 and Qt6 (http://qt-project.org/)
+Tested with Windows 11 + Qt 5.15.2 + Microsoft Visual Studio Build Tools 2019
+Tested with Windows 11 + Qt 5.6.1 + Microsoft Visual Studio Build Tools 2019
 Tested with Ubuntu Linux 18.04 + Qt 5.9.5
 Tested with macOS Sierra + Qt 5.7.0
 Dynamically linked open source software

ReleaseNotes_Viewer.txt

@@ -181,7 +181,6 @@ Changes
     * Prepare v2.22.0 (#249)
     * Adapt cmake build (#244)
     * fix: persist bool args with DLT_TYLE_8BIT (#247)
-    * Update to Qt 5.15.2, Visual Studio 2019 Build Tools and Qwt 6.1.6
     * Fix bat build
     * Central config for all Windows batch files (#240)
     * Update to Qt 5.12.12, Visual Studio 2017 Build Tools, simplify and cmake (#239)
@@ -253,7 +252,6 @@ Changes
     * Remove Travis
     * Reduce XCode builds
     * Make Windows Builds work
-    * removed qwt build from ci for now as it seemed optional and needs more refactoring
     * use correct exit codes for the three .bat files
     * upload a complete artifact including QT DLLs
     * make some parameters for the bat files CI-Friendly
@@ -430,7 +428,6 @@ Fixes:
     * Adjust to cmake changes
     * QTextStream wants an IO target. Fixes a crash when a plugin failes to load
     * Changed ambiguous wording in documentation for CMake builds (#44)
-    * Upgrade version of qt, qwt and visual studio for windows build.
     * Fixed corrupt message received when the DLT frame starting sequence is detected in the payload.
     * Fix the manual trigger for all ECUs
     * README: Fix links to mailing list and wiki page (#42)

build_config.bat

@@ -4,43 +4,28 @@ 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
+REM Currently tested combinations by Qt installation
+REM 5.15.2 msvc2019
+REM 6.6.1 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
+   set QTVER=5.15.2
+   REM 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"
+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 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%