Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 01:22:10 +01:00
Code Releases Activity

Windows: Don't run QZ as administrator after installation

Browse Source 
- Closes #2146
This commit is contained in:
srazi 2017-03-23 16:27:22 +04:30
parent f17e216bb3
commit d544a5dc5f
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
appveyor.yml
View File

@ -69,6 +69,8 @@ after_build:
appveyor DownloadFile "http://nsis.sourceforge.net/mediawiki/images/4/47/Registry.zip" ) else (echo "Use cached Registry.zip") appveyor DownloadFile "http://nsis.sourceforge.net/mediawiki/images/4/47/Registry.zip" ) else (echo "Use cached Registry.zip")
- IF NOT EXIST "AppAssocReg-0.4.zip" ( - IF NOT EXIST "AppAssocReg-0.4.zip" (
appveyor DownloadFile "http://nsis.sourceforge.net/mediawiki/images/d/d4/AppAssocReg-0.4.zip" ) else (echo "Use cached AppAssocReg-0.4.zip") appveyor DownloadFile "http://nsis.sourceforge.net/mediawiki/images/d/d4/AppAssocReg-0.4.zip" ) else (echo "Use cached AppAssocReg-0.4.zip")
- IF NOT EXIST "StdUtils.2016-05-14.r2.zip" (
appveyor DownloadFile "http://github.com/lordmulder/stdutils/releases/download/1.10/StdUtils.2016-05-14.r2.zip" ) else (echo "Use cached StdUtils.2016-05-14.r2.zip")
- IF NOT EXIST "master.tar.gz" ( - IF NOT EXIST "master.tar.gz" (
appveyor DownloadFile "http://chromium.googlesource.com/chromium/deps/hunspell_dictionaries/+archive/master.tar.gz" ) else (echo "Use cached master.tar.gz") appveyor DownloadFile "http://chromium.googlesource.com/chromium/deps/hunspell_dictionaries/+archive/master.tar.gz" ) else (echo "Use cached master.tar.gz")
- mkdir ..\wininstall - mkdir ..\wininstall
@ -80,8 +82,10 @@ after_build:
- 7z x "..\dependencies\KillProcDll&FindProcDll.zip" - 7z x "..\dependencies\KillProcDll&FindProcDll.zip"
- 7z x ..\dependencies\Registry.zip - 7z x ..\dependencies\Registry.zip
- 7z x ..\dependencies\AppAssocReg-0.4.zip - 7z x ..\dependencies\AppAssocReg-0.4.zip
- 7z x ..\dependencies\StdUtils.2016-05-14.r2.zip
- copy Desktop\Plugin\*.dll .\ - copy Desktop\Plugin\*.dll .\
- copy Plugins\Unicode\*.dll .\ - copy Plugins\Unicode\*.dll .\
- copy Include\*.nsh %QZ_DIR%\windows
# prepare icu # prepare icu
- 7z x "..\dependencies\%ICU_DIR_NAME%.zip" - 7z x "..\dependencies\%ICU_DIR_NAME%.zip"
# prepare qtwebengine_dictionaries # prepare qtwebengine_dictionaries

8
windows/installer.nsi
View File

@ -39,6 +39,7 @@
!addplugindir "wininstall\" !addplugindir "wininstall\"
!include "StdUtils.nsh"
!include "FileFunc.nsh" !include "FileFunc.nsh"
!include "wininstall\AllAssociation.nsh" !include "wininstall\AllAssociation.nsh"
SetCompressor /SOLID /FINAL lzma SetCompressor /SOLID /FINAL lzma
@ -63,7 +64,8 @@ SetCompressor /SOLID /FINAL lzma
!insertmacro MUI_PAGE_DIRECTORY !insertmacro MUI_PAGE_DIRECTORY
!insertmacro MUI_PAGE_INSTFILES !insertmacro MUI_PAGE_INSTFILES
!define MUI_FINISHPAGE_RUN "$INSTDIR\qupzilla.exe" !define MUI_FINISHPAGE_RUN
!define MUI_FINISHPAGE_RUN_FUNCTION "RunQupZillaAsUser"
!insertmacro MUI_PAGE_FINISH !insertmacro MUI_PAGE_FINISH
!insertmacro MUI_UNPAGE_WELCOME !insertmacro MUI_UNPAGE_WELCOME
@ -461,3 +463,7 @@ Function RegisterCapabilities
${EndIf} ${EndIf}
!endif !endif
FunctionEnd FunctionEnd
Function RunQupZillaAsUser
${StdUtils.ExecShellAsUser} $0 "$INSTDIR\qupzilla.exe" "open" ""
FunctionEnd