From e1c96dcbaccdf8cbd1e2fa28338f587bb63a7b4c Mon Sep 17 00:00:00 2001 From: David Rosca Date: Sun, 28 Jan 2018 16:37:13 +0100 Subject: [PATCH] Version 2.2.5 --- CHANGELOG | 4 +++- README.md | 2 +- appveyor.yml | 4 ++-- src/defines.pri | 2 +- src/main/Info.plist | 4 ++-- src/main/appicon.rc | 8 ++++---- windows/installer.nsi | 6 +++--- 7 files changed, 16 insertions(+), 14 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 70e636103..47c8b46a0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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 diff --git a/README.md b/README.md index 3f889f737..a41839f63 100644 --- a/README.md +++ b/README.md @@ -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: diff --git a/appveyor.yml b/appveyor.yml index 0c6e7f943..6bb7ef2f0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 2.2.4.{build}-{branch} +version: 2.2.5.{build}-{branch} shallow_clone: true cache: @@ -23,7 +23,7 @@ image: environment: global: - QZ_VER: 2.2.4 + QZ_VER: 2.2.5 VSVER: 14 ARCH: x86 QMAKESPEC: win32-msvc diff --git a/src/defines.pri b/src/defines.pri index bead0a3e8..74bbccd64 100644 --- a/src/defines.pri +++ b/src/defines.pri @@ -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"\\\"" diff --git a/src/main/Info.plist b/src/main/Info.plist index 70ae83933..984381a94 100644 --- a/src/main/Info.plist +++ b/src/main/Info.plist @@ -7,9 +7,9 @@ CFBundlePackageType APPL CFBundleGetInfoString - 2.2.4 + 2.2.5 CFBundleVersion - 2.2.4 + 2.2.5 CFBundleSignature @TYPEINFO@ CFBundleExecutable diff --git a/src/main/appicon.rc b/src/main/appicon.rc index 8eed71dbd..43c03d9d2 100644 --- a/src/main/appicon.rc +++ b/src/main/appicon.rc @@ -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 @@ -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" diff --git a/windows/installer.nsi b/windows/installer.nsi index a9b89978f..e66b52bc8 100644 --- a/windows/installer.nsi +++ b/windows/installer.nsi @@ -1,6 +1,6 @@ ; QupZilla Windows Installer NSIS Script -; Copyright (C) 2010-2017 David Rosca -; 2012-2017 S. Razi Alavizadeh +; Copyright (C) 2010-2018 David Rosca +; 2012-2018 S. Razi Alavizadeh ; ; For compiling this script you need following plugins: ; FindProcDLL_plug-in, KillProcDLL_plug-in and 'AllAssociation.nsh' needs @@ -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 .