From af80a882d06ad2054b20586e408db4bcbf930442 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=AD=90=E6=A5=9A=5Czhuzi?= Date: Tue, 4 Apr 2023 00:18:39 +0800 Subject: [PATCH] update --- src/win_install.bat | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/win_install.bat b/src/win_install.bat index d6c41337..23a692e5 100644 --- a/src/win_install.bat +++ b/src/win_install.bat @@ -18,10 +18,17 @@ copy /y %PWD_PATH%\FluentUI.h %BUILDER_BIN_PATH% & copy /y %PRESET_PATH%\* % if %ANDROID% == YES copy /y %LIBFILE_PATH% %BUILDER_BIN_PATH% +SET QMLPLUGINDUMP1_PATH=%QT_QML_FLUENT_PATH%\..\..\bin\qmlplugindump.exe +SET QMLPLUGINDUMP2_PATH=%QT_QML_FLUENT_PATH%\..\..\bin\qmlplugindump-qt6.exe + if %1 == SHARED ( echo running install to qtqml folder del /s /q %PRESET_PATH%\plugins.qmltypes - %QT_QML_FLUENT_PATH%\..\..\bin\qmlplugindump.exe -nonrelocatable FluentUI 1.0 > %PRESET_PATH%\plugins.qmltypes + if exist %QMLPLUGINDUMP1_PATH% ( + %QMLPLUGINDUMP1_PATH% -nonrelocatable FluentUI 1.0 > %PRESET_PATH%\plugins.qmltypes + ) else ( + %QMLPLUGINDUMP2_PATH% -nonrelocatable FluentUI 1.0 > %PRESET_PATH%\plugins.qmltypes + ) rmdir /s /q %QT_QML_FLUENT_PATH% & md %QT_QML_FLUENT_PATH% copy /y %BUILDER_BIN_PATH% %QT_QML_FLUENT_PATH% xcopy %PRESET_PATH% %QT_QML_FLUENT_PATH% /s/e/i/y