Merge pull request #3 from guh/deploy-runtime
add --compiler-runtime to windeployqt call
This commit is contained in:
commit
ec87f51886
2
mea.pro
2
mea.pro
@ -14,7 +14,7 @@ mea.depends = libnymea-common
|
|||||||
wininstaller.depends = mea
|
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 += 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 += 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
|
BR=$$BRANDING
|
||||||
equals(BR, "") {
|
equals(BR, "") {
|
||||||
wininstaller.commands += copy packaging\windows\packages\io.guh.mea\logo-guh.ico packaging\windows\packages\io.guh.mea\data\logo.ico &&
|
wininstaller.commands += copy packaging\windows\packages\io.guh.mea\logo-guh.ico packaging\windows\packages\io.guh.mea\data\logo.ico &&
|
||||||
|
|||||||
@ -18,5 +18,7 @@ Component.prototype.createOperations = function()
|
|||||||
component.addOperation("CreateShortcut", "@TargetDir@/mea.exe", "@StartMenuDir@/Mea.lnk",
|
component.addOperation("CreateShortcut", "@TargetDir@/mea.exe", "@StartMenuDir@/Mea.lnk",
|
||||||
"workingDirectory=@TargetDir@", "iconPath=@TargetDir@/logo.ico",
|
"workingDirectory=@TargetDir@", "iconPath=@TargetDir@/logo.ico",
|
||||||
"description=mea - The nymea frontend");
|
"description=mea - The nymea frontend");
|
||||||
|
|
||||||
|
component.addOperation("Execute", "@TargetDir@/vc_redist.x64.exe", "/quiet", "/norestart");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user