Merge pull request #3 from guh/deploy-runtime

add --compiler-runtime to windeployqt call
This commit is contained in:
Michael Zanetti 2018-05-22 19:48:39 +02:00 committed by GitHub
commit ec87f51886
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions

View File

@ -14,7 +14,7 @@ mea.depends = libnymea-common
wininstaller.depends = mea
wininstaller.commands += rmdir /S /Q packaging\windows\packages\io.guh.mea\data & mkdir packaging\windows\packages\io.guh.mea\data &&
wininstaller.commands += copy mea\release\mea.exe packaging\windows\packages\io.guh.mea\data\ &&
wininstaller.commands += windeployqt --qmldir mea\ui packaging\windows\packages\io.guh.mea\data\ &&
wininstaller.commands += windeployqt --compiler-runtime --qmldir mea\ui packaging\windows\packages\io.guh.mea\data\ &&
BR=$$BRANDING
equals(BR, "") {
wininstaller.commands += copy packaging\windows\packages\io.guh.mea\logo-guh.ico packaging\windows\packages\io.guh.mea\data\logo.ico &&

View File

@ -18,5 +18,7 @@ Component.prototype.createOperations = function()
component.addOperation("CreateShortcut", "@TargetDir@/mea.exe", "@StartMenuDir@/Mea.lnk",
"workingDirectory=@TargetDir@", "iconPath=@TargetDir@/logo.ico",
"description=mea - The nymea frontend");
component.addOperation("Execute", "@TargetDir@/vc_redist.x64.exe", "/quiet", "/norestart");
}
}