diff --git a/client_tools/lms/src/OPE_LMS/lms.qml b/client_tools/lms/src/OPE_LMS/lms.qml index e8d0e77e..34fee7c6 100644 --- a/client_tools/lms/src/OPE_LMS/lms.qml +++ b/client_tools/lms/src/OPE_LMS/lms.qml @@ -1141,7 +1141,7 @@ ApplicationWindow { // Breadcrumb Rectangle { id: appBreadCrumb; - height: 43; + height: 43; // TODO - Put this back when you want to see it 43; width: parent.width; Layout.fillWidth: true; Layout.preferredHeight: height; diff --git a/client_tools/lms/src/OPE_LMS/qt.conf b/client_tools/lms/src/OPE_LMS/qt.conf index c82505d8..78ad921b 100644 --- a/client_tools/lms/src/OPE_LMS/qt.conf +++ b/client_tools/lms/src/OPE_LMS/qt.conf @@ -7,7 +7,7 @@ Translations = translations ;i18n -Prefix=. +Prefix=./ Binaries=lib Libraries=lib Plugins=plugins diff --git a/client_tools/lms/src/OPE_LMS/win_deploy_6.5.2.cmd b/client_tools/lms/src/OPE_LMS/win_deploy_6.5.2.cmd index a1c012cb..3cb00fd6 100644 --- a/client_tools/lms/src/OPE_LMS/win_deploy_6.5.2.cmd +++ b/client_tools/lms/src/OPE_LMS/win_deploy_6.5.2.cmd @@ -12,7 +12,8 @@ set MSVC_MAJOR_VER=2019 rem WORKAROUND - qt 6.5 fails on windeployqt - should be fixed in 6.5.1 set TRANSLATIONS=--no-translations -rem set VC_DIR=C:\Program Files (x86)\Microsoft Visual Studio\%MSVC_MAJOR_VER%\%VC_EDITION%\VC +set MSVC_BINARIES=C:\Program Files (x86)\Microsoft Visual Studio\%MSVC_MAJOR_VER%\%VC_EDITION%\VC\Redist\MSVC\%MSVC_VER%\x64\Microsoft.VC142.CRT +rem set VC_DIR=C:\Program Files (x86)\Microsoft Visual Studio\\VC rem set VCINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio\%MSVC_MAJOR_VER%\%VC_EDITION%\VC rem IF NOT EXIST "%QT_PATH%" ( @@ -55,9 +56,9 @@ set DEBUG_BUILD_DIR=%PROJECT_ROOT%\build-OPE_LMS-Desktop_Qt_%QT_VER_FOLDER%_MSVC rem set PATH=%PATH%;%QT_PATH%\msvc%MSVC_MAJOR_VER%_64\bin rem %QT_PATH%\msvc2019_64\bin\windeployqt.exe --compiler-runtime --qmldir ../../OPE_LMS --angle OPE_LMS.exe -%QT_PATH%\msvc%MSVC_MAJOR_VER%_64\bin\windeployqt.exe %TRANSLATIONS% --force --compiler-runtime --qmldir "%CODE_ROOT%" --libdir "%RELEASE_BUILD_DIR%\lib" --dir "%RELEASE_BUILD_DIR%" --plugindir "%RELEASE_BUILD_DIR%\plugins" "%RELEASE_BUILD_DIR%\OPE_LMS.exe" +%QT_PATH%\msvc%MSVC_MAJOR_VER%_64\bin\windeployqt.exe %TRANSLATIONS% --force --compiler-runtime --qmldir "%CODE_ROOT%" --libdir "%RELEASE_BUILD_DIR%" --dir "%RELEASE_BUILD_DIR%" --plugindir "%RELEASE_BUILD_DIR%\plugins" "%RELEASE_BUILD_DIR%\OPE_LMS.exe" -%QT_PATH%\msvc%MSVC_MAJOR_VER%_64\bin\windeployqt.exe %TRANSLATIONS% --force --compiler-runtime --qmldir "%CODE_ROOT%" --libdir "%DEBUG_BUILD_DIR%\lib" --dir "%DEBUG_BUILD_DIR%" --plugindir "%DEBUG_BUILD_DIR%\plugins" "%DEBUG_BUILD_DIR%\OPE_LMS.exe" +%QT_PATH%\msvc%MSVC_MAJOR_VER%_64\bin\windeployqt.exe %TRANSLATIONS% --force --compiler-runtime --qmldir "%CODE_ROOT%" --libdir "%DEBUG_BUILD_DIR%" --dir "%DEBUG_BUILD_DIR%" --plugindir "%DEBUG_BUILD_DIR%\plugins" "%DEBUG_BUILD_DIR%\OPE_LMS.exe" REM NOTE - Need to move resources/* to release folder @@ -75,5 +76,10 @@ rem xcopy /YI "%DEBUG_BUILD_DIR%\tls" "%DEBUG_BUILD_DIR%\plugins\tls" rem Move back to project folder rem cd ..\..\OPE_LMS +Rem Copy in MSVC run time files +rem concrt140.dll, msvcp140.dll, vccorlib140.dll, and vcruntime140.dll. +xcopy /YI "%MSVC_BINARIES%\*" "%RELEASE_BUILD_DIR%" +xcopy /YI "%MSVC_BINARIES%\*" "%DEBUG_BUILD_DIR%" + echo Done Building!!!! pause