Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-09-21 09:42:10 +02:00
Code Releases Activity

Merge branch 'v2.1'

Browse Source
This commit is contained in:
David Rosca 2017-02-14 12:20:54 +01:00
commit 5fe3efab82
5 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGELOG
View File

@ -1,3 +1,12 @@
Version 2.1.1
* released 13 February 2017
* updated translations
* fix loading previews in SpeedDial
* fix showing duplicated languages in spellcheck settings
* fix sometimes pages being scrolled by itself when using native scrollbars
* fix disabling GreaseMonkey scripts
* Windows: fix highlight text color in item views
Version 2.1.0 Version 2.1.0
* released 4 February 2017 * released 4 February 2017
* bring back spellcheck * bring back spellcheck

2
README.md
View File

@ -62,7 +62,7 @@ You need to specify path to `macdeployqt` only if it is not in PATH.
Current version Current version
---------------------------------------------------------------------------------------- ----------------------------------------------------------------------------------------
The current stable version of QupZilla is 2.1.0. You can download precompiled packages The current stable version of QupZilla is 2.1.1. You can download precompiled packages
and the sources from the download section at [homepage](http://www.qupzilla.com/download). and the sources from the download section at [homepage](http://www.qupzilla.com/download).
However, if you want the latest revision, just take the latest code snapshot either by However, if you want the latest revision, just take the latest code snapshot either by
downloading a tarball or running: downloading a tarball or running:

4
src/main/Info.plist
View File

@ -7,9 +7,9 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleGetInfoString</key> <key>CFBundleGetInfoString</key>
<string>2.1.0</string> <string>2.1.1</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>2.1.0</string> <string>2.1.1</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>@TYPEINFO@</string> <string>@TYPEINFO@</string>
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>

8
src/main/appicon.rc
View File

@ -4,8 +4,8 @@ IDI_ICON1 ICON DISCARDABLE "..\lib\data\icons\exeicons\qupzilla.ico"
IDI_ICON2 ICON DISCARDABLE "..\lib\data\icons\exeicons\page.ico" IDI_ICON2 ICON DISCARDABLE "..\lib\data\icons\exeicons\page.ico"
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,1,0,0 FILEVERSION 2,1,1,0
PRODUCTVERSION 2,1,0,0 PRODUCTVERSION 2,1,1,0
FILEFLAGS 0x0L FILEFLAGS 0x0L
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
FILEOS 0x00040004L FILEOS 0x00040004L
@ -18,12 +18,12 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "QupZilla Team" VALUE "CompanyName", "QupZilla Team"
VALUE "FileDescription", "QupZilla Web Browser" VALUE "FileDescription", "QupZilla Web Browser"
VALUE "FileVersion", "2.1.0" VALUE "FileVersion", "2.1.1"
VALUE "LegalCopyright", "Copyright (C) 2010-2017 David Rosca" VALUE "LegalCopyright", "Copyright (C) 2010-2017 David Rosca"
VALUE "InternalName", "qupzilla" VALUE "InternalName", "qupzilla"
VALUE "OriginalFilename", "qupzilla.exe" VALUE "OriginalFilename", "qupzilla.exe"
VALUE "ProductName", "QupZilla" VALUE "ProductName", "QupZilla"
VALUE "ProductVersion", "2.1.0" VALUE "ProductVersion", "2.1.1"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

2
windows/installer.nsi
View File

@ -24,7 +24,7 @@ RequestExecutionLevel admin
SetCompressor /SOLID /FINAL lzma SetCompressor /SOLID /FINAL lzma
!define PRODUCT_NAME "QupZilla" !define PRODUCT_NAME "QupZilla"
!define /date PRODUCT_VERSION "2.1.0" !define /date PRODUCT_VERSION "2.1.1"
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\qupzilla.exe" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\qupzilla.exe"
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
!define PRODUCT_UNINST_ROOT_KEY "HKLM" !define PRODUCT_UNINST_ROOT_KEY "HKLM"