diff --git a/build_config.bat b/build_config.bat
index 4e6b028a..1222f972 100644
--- a/build_config.bat
+++ b/build_config.bat
@@ -8,9 +8,16 @@ REM Currently tested combinations by Qt installation
 REM 5.15.2 msvc2019
 REM 6.6.1 msvc2019
 
+if "%QTNO%"=="" (
+   set QTNO=5
+)
+
 if "%QTVER%"=="" (
-   set QTVER=5.15.2
-   REM set QTVER=6.6.1
+   if "%QTNO%"=="5" (
+		set QTVER=5.15.2 
+   )  else (
+		set QTVER=6.6.1 
+   )
 )
 
 if "%MSVC_VER%"=="" (
diff --git a/build_sdk_windows_qt5_MSVC.bat b/build_sdk_windows_qt5_MSVC.bat
index 954404dc..c02dfc78 100644
--- a/build_sdk_windows_qt5_MSVC.bat
+++ b/build_sdk_windows_qt5_MSVC.bat
@@ -13,14 +13,14 @@ call build_config.bat
 
 if '%WORKSPACE%'=='' (
     if '%DLT_VIEWER_SDK_DIR%'=='' (
-        set DLT_VIEWER_SDK_DIR=c:\DltViewerSDK
+        set DLT_VIEWER_SDK_DIR=c:\DltViewerSDKQt%QTNO%
     )
 
     set SOURCE_DIR=%CD%
     set BUILD_DIR=%CD%\build\release
 ) else (
     if '%DLT_VIEWER_SDK_DIR%'=='' (
-        set DLT_VIEWER_SDK_DIR=%WORKSPACE%\build\dist\DltViewerSDK
+        set DLT_VIEWER_SDK_DIR=%WORKSPACE%\build\dist\DltViewerSDKQt%QTNO%
     )
 
     set SOURCE_DIR=%WORKSPACE%
diff --git a/build_sdk_windows_qt5_MSVC_cmake.bat b/build_sdk_windows_qt5_MSVC_cmake.bat
index d39aa928..fd35164e 100644
--- a/build_sdk_windows_qt5_MSVC_cmake.bat
+++ b/build_sdk_windows_qt5_MSVC_cmake.bat
@@ -21,7 +21,7 @@ if "%WORKSPACE%"=="" (goto NO_WORKSPACE) else (goto WITH_WORKSPACE)
     set DIST_DIR=%SOURCE_DIR%\build\dist
 
     if "%DLT_VIEWER_SDK_DIR%"=="" (
-        set DLT_VIEWER_SDK_DIR=c:\DltViewerSDK
+        set DLT_VIEWER_SDK_DIR=c:\DltViewerSDKQt%QTNO%
     )
 
     goto Continue1
@@ -31,7 +31,7 @@ if "%WORKSPACE%"=="" (goto NO_WORKSPACE) else (goto WITH_WORKSPACE)
     set DIST_DIR=%SOURCE_DIR%\build\dist
 
     if "%DLT_VIEWER_SDK_DIR%"=="" (
-        set DLT_VIEWER_SDK_DIR=%DIST_DIR%\DltViewerSDK
+        set DLT_VIEWER_SDK_DIR=%DIST_DIR%\DltViewerSDKQt%QTNO%
     )
 :Continue1