Skip to content

Commit 50adf75

Browse files
committed
CI: install qtwebengine resources in msvc.yml
1 parent 194abda commit 50adf75

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

.github/workflows/msvc.yml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,6 @@ jobs:
2424
BUILD_TYPE: Release
2525
os: windows-2022
2626

27-
- CMAKE_GENERATOR_PLATFORM: x64
28-
VCPKG_TARGET_TRIPLET: x64-windows
29-
VCPKG_PLATFORM_TOOLSET: v143
30-
qt_version: 6.8.1
31-
qt_arch: win64_msvc2022_64
32-
qt_modules: qtscxml qtmultimedia qtimageformats qtserialport qt5compat qtwebsockets qtpositioning qtwebchannel qtwebengine
33-
BUILD_TYPE: Release
34-
os: windows-2022
35-
3627
- CMAKE_GENERATOR_PLATFORM: arm64
3728
VCPKG_TARGET_TRIPLET: arm64-windows
3829
VCPKG_PLATFORM_TOOLSET: v143
@@ -456,8 +447,11 @@ jobs:
456447
copy /Y ${{env.INSTALL_DIR}}\lib\*.dll install\bin
457448
copy /Y vcpkg_installed\${{matrix.VCPKG_TARGET_TRIPLET}}\bin\*.dll install\bin
458449
IF EXIST "${{env.INSTALL_DIR}}\share\qtermwidget6" (
459-
xcopy "${{env.INSTALL_DIR}}\share\qtermwidget6" install\share\qtermwidget6 /Y /S /I
450+
xcopy /Y /S /I "${{env.INSTALL_DIR}}\share\qtermwidget6" install\share\qtermwidget6
460451
)
452+
copy /Y %QT_ROOT_DIR%\bin\QtWebEngineProcess.exe install\bin
453+
xcopy /Y /S /I %QT_ROOT_DIR%\resources install\bin\resources
454+
xcopy /Y /S /I %QT_ROOT_DIR%\translations install\bin\translations
461455
C:\msys64\usr\bin\wget https://npcap.com/dist/npcap-1.80.exe
462456
copy npcap-1.80.exe install\bin
463457
;7z a RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}_Portable.zip .\install\*

Src/ParameterCompone/ParameterPluginUI.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>400</width>
9+
<width>430</width>
1010
<height>593</height>
1111
</rect>
1212
</property>

0 commit comments

Comments
 (0)