From 4062473e98a91779a5bea59638935ca7d59c38c5 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Sat, 4 Feb 2017 10:46:48 +0100 Subject: [PATCH] Version 2.1.0 --- CHANGELOG | 27 +++++++++++++++++++++++++++ COPYRIGHT | 2 +- README.md | 2 +- src/defines.pri | 2 +- src/lib/app/profilemanager.cpp | 9 +++++++-- src/main/Info.plist | 4 ++-- src/main/appicon.rc | 10 +++++----- windows/installer.nsi | 2 +- 8 files changed, 45 insertions(+), 13 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 2af36be21..0b44c247f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,30 @@ +Version 2.1.0 + * released 4 February 2017 + * bring back spellcheck + * bring back support for printing + * bring back save page action + support multiple formats + * bring back option to delete cookies on close + * bring back per-domain user agent settings + * show audio playing indicator in tab with possibility to mute + * show background activity indicator in pinned tabs + * add option to show navigation bar when opening new tab in fullscreen + * add option to show bookmarks toolbar when typing in location bar + * add option to use native scrollbars + * add option to delete cache on close + * each tab has now its own search toolbar + * lot of HighDPI fixes + * fix setting maximum size of cache + * fix scrolling with high resolution mouse/touchpad + * fix rules for disabling blocking on pages in AdBlock + * fix deleting cookies + * fix slow search in icons database + * fix restoring zoom level of tabs + * fix crash when opening web inspector + * fix crash of the application when render process crashes + * fix tabbar being invisible sometimes after leaving fullscreen + * fix sometimes not showing list of windows and tabs in recovery page + * Windows: show download progress in taskbar + Version 2.0.2 * released 24 October 2016 * update default user-agent strings diff --git a/COPYRIGHT b/COPYRIGHT index 736baeae3..7ded04443 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,6 +1,6 @@ /* ============================================================ * QupZilla - WebKit based browser -* Copyright (C) 2010-2016 David Rosca +* Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/README.md b/README.md index 88971ca9e..231a35c04 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,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.2. You can download precompiled packages +The current stable version of QupZilla is 2.1.0. 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/src/defines.pri b/src/defines.pri index 69f4dc275..a68b41252 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.99 +QZ_VERSION = 2.1.0 unix: VERSION = $$QZ_VERSION DEFINES *= QUPZILLA_VERSION=\\\"""$$QZ_VERSION"\\\"" diff --git a/src/lib/app/profilemanager.cpp b/src/lib/app/profilemanager.cpp index ba6ab8c26..5695fcfd3 100644 --- a/src/lib/app/profilemanager.cpp +++ b/src/lib/app/profilemanager.cpp @@ -1,6 +1,6 @@ /* ============================================================ -* QupZilla - WebKit based browser -* Copyright (C) 2010-2016 David Rosca +* QupZilla - Qt web browser +* Copyright (C) 2010-2017 David Rosca * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -197,6 +197,11 @@ void ProfileManager::updateProfile(const QString ¤t, const QString &profil return; } + // No change in 2.1 + if (prof < Updater::Version("2.1.99")) { + return; + } + // Nothing for now } diff --git a/src/main/Info.plist b/src/main/Info.plist index 533274291..34f7704b4 100644 --- a/src/main/Info.plist +++ b/src/main/Info.plist @@ -7,9 +7,9 @@ CFBundlePackageType APPL CFBundleGetInfoString - 2.0.2 + 2.1.0 CFBundleVersion - 2.0.2 + 2.1.0 CFBundleSignature @TYPEINFO@ CFBundleExecutable diff --git a/src/main/appicon.rc b/src/main/appicon.rc index f3c240541..7f9b10910 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,2 - PRODUCTVERSION 2,0,0,2 + FILEVERSION 2,1,0,0 + PRODUCTVERSION 2,1,0,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.0.2" - VALUE "LegalCopyright", "Copyright (C) 2010-2014 David Rosca" + VALUE "FileVersion", "2.1.0" + VALUE "LegalCopyright", "Copyright (C) 2010-2017 David Rosca" VALUE "InternalName", "qupzilla" VALUE "OriginalFilename", "qupzilla.exe" VALUE "ProductName", "QupZilla" - VALUE "ProductVersion", "2.0.2" + VALUE "ProductVersion", "2.1.0" END END BLOCK "VarFileInfo" diff --git a/windows/installer.nsi b/windows/installer.nsi index 51a1f34ab..950a18e44 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.2" +!define /date PRODUCT_VERSION "2.1.0" !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"