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.5
Browse files Browse the repository at this point in the history
  • Loading branch information
nowrep committed Jan 28, 2018
1 parent 9595359 commit e1c96dc
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 14 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
Version 2.2.5
* released xx xx 2018
* released 28 January 2018
* added Unload Tab action
* added search engine buttons to locationbar completer
* added option to disable automatic password completion on sites
* plugins are now always enabled (fixes missing AdBlock)
* bring back AdBlock and GreaseMonkey icons in statusbar + add new buttons
* fix incorrect size of buttons in bookmarks toolbar with some styles
* fix losing session when loading newer profile with old application version
* fix temporariliy enabling/disabling JavaScript using StatusBarIcons plugin
* fix user agent settings not being applied on startup
* fix calculating remaining time in download manager

Version 2.2.4
* released 16 January 2018
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.4. You can download precompiled packages
The current stable version of QupZilla is 2.2.5. 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.4.{build}-{branch}
version: 2.2.5.{build}-{branch}
shallow_clone: true

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

environment:
global:
QZ_VER: 2.2.4
QZ_VER: 2.2.5
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.4
QZ_VERSION = 2.2.5
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.4</string>
<string>2.2.5</string>
<key>CFBundleVersion</key>
<string>2.2.4</string>
<string>2.2.5</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,4,0
PRODUCTVERSION 2,2,4,0
FILEVERSION 2,2,5,0
PRODUCTVERSION 2,2,5,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.4"
VALUE "FileVersion", "2.2.5"
VALUE "LegalCopyright", "Copyright (C) 2010-2018 David Rosca"
VALUE "InternalName", "qupzilla"
VALUE "OriginalFilename", "qupzilla.exe"
VALUE "ProductName", "QupZilla"
VALUE "ProductVersion", "2.2.4"
VALUE "ProductVersion", "2.2.5"
END
END
BLOCK "VarFileInfo"
Expand Down
6 changes: 3 additions & 3 deletions windows/installer.nsi
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
; QupZilla Windows Installer NSIS Script
; Copyright (C) 2010-2017 David Rosca <[email protected]>
; 2012-2017 S. Razi Alavizadeh <[email protected]>
; Copyright (C) 2010-2018 David Rosca <[email protected]>
; 2012-2018 S. Razi Alavizadeh <[email protected]>
;
; For compiling this script you need following plugins:
; FindProcDLL_plug-in, KillProcDLL_plug-in and 'AllAssociation.nsh' needs
Expand All @@ -11,7 +11,7 @@
; http://nsis.sourceforge.net/Registry_plug-in

!ifndef CUSTOM
!define VERSION 2.2.4
!define VERSION 2.2.5
!define ARCH x86
!define MSVC_VER 140
!define OPENSSL_BIN_DIR .
Expand Down

2 comments on commit e1c96dc

@Martii
Copy link
Contributor

@Martii Martii commented on e1c96dc Jan 30, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nowrep

Update for 2.2.5 release (macOS)

Release is at /Martii/qupzilla/releases/tag/2.2.5+e1c96dc

Creating a new PR on https://github.com/QupZilla/qupzilla.com/pulls currently takes me to https://github.com/QupZilla/qupzilla.com/compare in every browser instead of a real PR entry. :\ So this is the best I can do for the moment.

@Martii
Copy link
Contributor

@Martii Martii commented on e1c96dc Jan 30, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did it actually with git... that seems to work... redispatched at QupZilla/qupzilla.com#53

Please sign in to comment.