Fix performance of Windows release build.

Signed-off-by: Alexander Wenzel <[email protected]>
COVESA · Jul 15, 2024 · 9dfb936 · 9dfb936
1 parent a0f2d5e
commit 9dfb936
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 0 deletions.
diff --git a/build_parser_windows_qt5_MSVC.bat b/build_parser_windows_qt5_MSVC.bat
@@ -140,6 +140,15 @@ if %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER
 copy %QTDIR%\plugins\platforms\qwindows.dll %DLT_PARSER_DIR%\platforms
 if %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER
 
+if "%QTNO%"=="5" (
+	copy %QTDIR%\plugins\styles\qwindowsvistastyle.dll %DLT_VIEWER_SDK_DIR%\styles
+	if %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER
+)
+if "%QTNO%"=="6" (
+	copy %QTDIR%\plugins\styles\qmodernwindowsstyle.dll %DLT_VIEWER_SDK_DIR%\styles
+	if %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER
+)
+
 xcopy %SOURCE_DIR%\parser\examples %DLT_PARSER_DIR%\examples /E
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER
 

diff --git a/build_sdk_windows_qt5_MSVC.bat b/build_sdk_windows_qt5_MSVC.bat
@@ -163,6 +163,15 @@ if %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER
 copy %QTDIR%\plugins\platforms\qwindows.dll %DLT_VIEWER_SDK_DIR%\platforms
 if %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER
 
+if "%QTNO%"=="5" (
+	copy %QTDIR%\plugins\styles\qwindowsvistastyle.dll %DLT_VIEWER_SDK_DIR%\styles
+	if %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER
+)
+if "%QTNO%"=="6" (
+	copy %QTDIR%\plugins\styles\qmodernwindowsstyle.dll %DLT_VIEWER_SDK_DIR%\styles
+	if %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER
+)
+
 copy %BUILD_DIR%\dlt-viewer.exe %DLT_VIEWER_SDK_DIR%
 if %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER
 

diff --git a/src/cmake/Windows.cmake b/src/cmake/Windows.cmake
@@ -39,6 +39,20 @@ install(FILES
     COMPONENT qt_libraries)
 endif()
 
+if("${QT_PREFIX}" STREQUAL "Qt5")
+install(FILES
+    "${DLT_QT_LIB_DIR}/../plugins/styles/qwindowsvistastyle.dll"
+    DESTINATION "${DLT_EXECUTABLE_INSTALLATION_PATH}/styles"
+    COMPONENT qt_libraries)
+endif()
+
+if("${QT_PREFIX}" STREQUAL "Qt6")
+install(FILES
+    "${DLT_QT_LIB_DIR}/../plugins/styles/qmodernwindowsstyle.dll"
+    DESTINATION "${DLT_EXECUTABLE_INSTALLATION_PATH}/styles"
+    COMPONENT qt_libraries)
+endif()
+
 option(INCLUDE_VC_REDIST "Add vc_redist.x64.exe cmake install command" OFF)
 if(INCLUDE_VC_REDIST)
   get_filename_component(MSVC_COMPILER_DIR "${CMAKE_CXX_COMPILER}" DIRECTORY )