Skip to content
This repository has been archived by the owner on May 10, 2018. It is now read-only.

Commit

Permalink
Version 2.2.6
Browse files Browse the repository at this point in the history
  • Loading branch information
nowrep committed Mar 13, 2018
1 parent ae73219 commit 879dce4
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 12 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
Version 2.2.6
* released 13 March 2018
* added VerticalTabs plugin
* added NoCoin List as default list to AdBlock
* added support for userscript icons in GreaseMonkey
* added extension:// scheme to be used from plugins
* added support for changing default background color of webview
* added support for real WebInspector with QtWebEngine 5.11
* added support for filtering 3rd party cookies with QtWebEngine 5.11
* improved Unload Tab action to kill the web process entirely
* fix default size of pinned tabs with some Qt styles
* fix loading incomplete urls from locationbar with search disabled

Version 2.2.5
* released 28 January 2018
* added Unload Tab action
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ On Mac OS X: To deploy QupZilla in dmg image, run this command:
Current version
----------------------------------------------------------------------------------------

The current stable version of QupZilla is 2.2.5. You can download precompiled packages
The current stable version of QupZilla is 2.2.6. You can download precompiled packages
and the sources from the download section at [homepage](https://www.qupzilla.com/download).
However, if you want the latest revision, just take the latest code snapshot either by
downloading a tarball or running:
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: 2.2.5.{build}-{branch}
version: 2.2.6.{build}-{branch}
shallow_clone: true

cache:
Expand All @@ -23,7 +23,7 @@ image:

environment:
global:
QZ_VER: 2.2.5
QZ_VER: 2.2.6
VSVER: 14
ARCH: x86
QMAKESPEC: win32-msvc
Expand Down
2 changes: 1 addition & 1 deletion src/defines.pri
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ UI_DIR = $$PWD/../build
# workaround for #849: see https://bugreports.qt-project.org/browse/QTBUG-23196
mocinclude.CONFIG *= fix_target

QZ_VERSION = 2.2.5
QZ_VERSION = 2.2.6
unix: VERSION = $$QZ_VERSION
DEFINES *= QUPZILLA_VERSION=\\\"""$$QZ_VERSION"\\\""

Expand Down
4 changes: 2 additions & 2 deletions src/main/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleGetInfoString</key>
<string>2.2.5</string>
<string>2.2.6</string>
<key>CFBundleVersion</key>
<string>2.2.5</string>
<string>2.2.6</string>
<key>CFBundleSignature</key>
<string>@TYPEINFO@</string>
<key>CFBundleExecutable</key>
Expand Down
8 changes: 4 additions & 4 deletions src/main/appicon.rc
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ IDI_ICON1 ICON DISCARDABLE "..\lib\data\icons\exeicons\qupzilla.ico"
IDI_ICON2 ICON DISCARDABLE "..\lib\data\icons\exeicons\page.ico"

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,2,5,0
PRODUCTVERSION 2,2,5,0
FILEVERSION 2,2,6,0
PRODUCTVERSION 2,2,6,0
FILEFLAGS 0x0L
FILEFLAGSMASK 0x3fL
FILEOS 0x00040004L
Expand All @@ -18,12 +18,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "QupZilla Team"
VALUE "FileDescription", "QupZilla Web Browser"
VALUE "FileVersion", "2.2.5"
VALUE "FileVersion", "2.2.6"
VALUE "LegalCopyright", "Copyright (C) 2010-2018 David Rosca"
VALUE "InternalName", "qupzilla"
VALUE "OriginalFilename", "qupzilla.exe"
VALUE "ProductName", "QupZilla"
VALUE "ProductVersion", "2.2.5"
VALUE "ProductVersion", "2.2.6"
END
END
BLOCK "VarFileInfo"
Expand Down
4 changes: 2 additions & 2 deletions windows/installer.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
; http://nsis.sourceforge.net/Registry_plug-in

!ifndef CUSTOM
!define VERSION 2.2.5
!define VERSION 2.2.6
!define ARCH x86
!define MSVC_VER 140
!define OPENSSL_BIN_DIR .
Expand Down Expand Up @@ -507,7 +507,7 @@ Function un.onInit
StrCpy $INSTDIR "$R0"

IfFileExists "$INSTDIR\qupzilla.exe" found
MessageBox MB_OK|MB_ICONSTOP "$(MSG_InvalidInstallPath)"
MessageBox MB_OK|MB_ICONSTOP "$(MSG_InvalidInstallPath)"
Abort
found:
FunctionEnd

0 comments on commit 879dce4

Please sign in to comment.