From 483202860087d73cb8491ceb3f3262bf336bd047 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Wed, 8 Jun 2016 16:24:44 +0200 Subject: [PATCH] Version 2.0.1 --- CHANGELOG | 12 ++++++++++++ README.md | 2 +- haiku/QupZilla.rdef | 2 +- src/defines.pri | 2 +- src/lib/app/profilemanager.cpp | 5 +++++ src/main/Info.plist | 4 ++-- src/main/appicon.rc | 8 ++++---- windows/installer.nsi | 2 +- 8 files changed, 27 insertions(+), 10 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 161f2c4f5..318a418f1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,15 @@ +Version 2.0.1 + * released 8 June 2016 + * don't force enabling HighDPI scaling by default + * fix crash when unloading AutoScroll plugin + * fix showing Inspect Element action when web inspector is disabled + * fix showing context menu when page zoom is not 100% + * fix destroying WebPage when opened as popup + * fix setting default font families + * fix saving last download path in download manager + * fix using external download manager + * fix canceliing http and proxy authentication dialogs + Version 2.0.0 * released 30 March 2016 * switch to QtWebEngine - much better compatibility and stability diff --git a/README.md b/README.md index 14c9851eb..9c7ed3f5b 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ You need to specify path to `macdeployqt` only if it is not in PATH. Current version ---------------------------------------------------------------------------------------- -The current stable version of QupZilla is 2.0.0. You can download precompiled packages +The current stable version of QupZilla is 2.0.1. You can download precompiled packages 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 downloading a tarball or running: diff --git a/haiku/QupZilla.rdef b/haiku/QupZilla.rdef index 9103f6a32..1e59dd500 100644 --- a/haiku/QupZilla.rdef +++ b/haiku/QupZilla.rdef @@ -3,7 +3,7 @@ resource app_flags B_SINGLE_LAUNCH; resource app_version { major = 2, middle = 0, - minor = 0, + minor = 1, /* Application "variety" can be set to one of the following: * B_APPV_DEVELOPMENT, diff --git a/src/defines.pri b/src/defines.pri index d195e5d7a..7e62638d8 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.0.0 +QZ_VERSION = 2.0.1 unix: VERSION = $$QZ_VERSION DEFINES *= QUPZILLA_VERSION=\\\"""$$QZ_VERSION"\\\"" diff --git a/src/lib/app/profilemanager.cpp b/src/lib/app/profilemanager.cpp index 405393fdd..4de53fc4c 100644 --- a/src/lib/app/profilemanager.cpp +++ b/src/lib/app/profilemanager.cpp @@ -194,6 +194,11 @@ void ProfileManager::updateProfile(const QString ¤t, const QString &profil return; } + // No change in 2.0 + if (prof < Updater::Version("2.0.99")) { + return; + } + // Nothing for now } diff --git a/src/main/Info.plist b/src/main/Info.plist index e9f9f08e8..493d1d97f 100644 --- a/src/main/Info.plist +++ b/src/main/Info.plist @@ -7,9 +7,9 @@ CFBundlePackageType APPL CFBundleGetInfoString - 2.0.0 + 2.0.1 CFBundleVersion - 2.0.0 + 2.0.1 CFBundleSignature @TYPEINFO@ CFBundleExecutable diff --git a/src/main/appicon.rc b/src/main/appicon.rc index d93155d9f..f059d4637 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,0,0,0 - PRODUCTVERSION 2,0,0,0 + FILEVERSION 2,0,0,1 + PRODUCTVERSION 2,0,0,1 FILEFLAGS 0x0L FILEFLAGSMASK 0x3fL FILEOS 0x00040004L @@ -18,12 +18,12 @@ BEGIN BEGIN VALUE "CompanyName", "QupZilla Team" VALUE "FileDescription", "QupZilla Web Browser" - VALUE "FileVersion", "2.0.0" + VALUE "FileVersion", "2.0.1" VALUE "LegalCopyright", "Copyright (C) 2010-2014 David Rosca" VALUE "InternalName", "qupzilla" VALUE "OriginalFilename", "qupzilla.exe" VALUE "ProductName", "QupZilla" - VALUE "ProductVersion", "2.0.0" + VALUE "ProductVersion", "2.0.1" END END BLOCK "VarFileInfo" diff --git a/windows/installer.nsi b/windows/installer.nsi index 20e03d99c..15c345647 100644 --- a/windows/installer.nsi +++ b/windows/installer.nsi @@ -24,7 +24,7 @@ RequestExecutionLevel admin SetCompressor /SOLID /FINAL lzma !define PRODUCT_NAME "QupZilla" -!define /date PRODUCT_VERSION "2.0.0" +!define /date PRODUCT_VERSION "2.0.1" !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_ROOT_KEY "HKLM"