diff --git a/CHANGELOG b/CHANGELOG index 92f132d0b..839fcd355 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,8 @@ +Version 2.2.3 + * released 19 December 2017 + * fix crashes with Qt 5.10 + * fix default proxy configuration type in preferences + Version 2.2.2 * released 05 December 2017 * updated available user agent strings diff --git a/README.md b/README.md index 3e5db7dd0..1f6545cdf 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.2. You can download precompiled packages +The current stable version of QupZilla is 2.2.3. 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 1737a4bc0..cabe9e0ab 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 2.2.2.{build}-{branch} +version: 2.2.3.{build}-{branch} shallow_clone: true cache: @@ -23,7 +23,7 @@ image: environment: global: - QZ_VER: 2.2.2 + QZ_VER: 2.2.3 VSVER: 14 ARCH: x86 QMAKESPEC: win32-msvc diff --git a/src/defines.pri b/src/defines.pri index 3591da420..1fa5b4efe 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.2 +QZ_VERSION = 2.2.3 unix: VERSION = $$QZ_VERSION DEFINES *= QUPZILLA_VERSION=\\\"""$$QZ_VERSION"\\\"" diff --git a/src/main/Info.plist b/src/main/Info.plist index 7b86f3285..c27a352fc 100644 --- a/src/main/Info.plist +++ b/src/main/Info.plist @@ -7,9 +7,9 @@ CFBundlePackageType APPL CFBundleGetInfoString - 2.2.2 + 2.2.3 CFBundleVersion - 2.2.2 + 2.2.3 CFBundleSignature @TYPEINFO@ CFBundleExecutable diff --git a/src/main/appicon.rc b/src/main/appicon.rc index adc88a201..84671f6e5 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,2,0 - PRODUCTVERSION 2,2,2,0 + FILEVERSION 2,2,3,0 + PRODUCTVERSION 2,2,3,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.2" + VALUE "FileVersion", "2.2.3" VALUE "LegalCopyright", "Copyright (C) 2010-2017 David Rosca" VALUE "InternalName", "qupzilla" VALUE "OriginalFilename", "qupzilla.exe" VALUE "ProductName", "QupZilla" - VALUE "ProductVersion", "2.2.2" + VALUE "ProductVersion", "2.2.3" END END BLOCK "VarFileInfo" diff --git a/windows/installer.nsi b/windows/installer.nsi index 0b2df1b05..e3e6cb7ca 100644 --- a/windows/installer.nsi +++ b/windows/installer.nsi @@ -11,7 +11,7 @@ ; http://nsis.sourceforge.net/Registry_plug-in !ifndef CUSTOM - !define VERSION 2.2.2 + !define VERSION 2.2.3 !define ARCH x86 !define MSVC_VER 140 !define OPENSSL_BIN_DIR .