Skip to content
This repository has been archived by the owner on May 10, 2018. It is now read-only.

Commit

Permalink
Version 2.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
nowrep committed Feb 4, 2017
1 parent db5a260 commit 4062473
Show file tree
Hide file tree
Showing 8 changed files with 45 additions and 13 deletions.
27 changes: 27 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion COPYRIGHT
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* ============================================================
* QupZilla - WebKit based browser
* Copyright (C) 2010-2016 David Rosca <nowrep@gmail.com>
* Copyright (C) 2010-2017 David Rosca <nowrep@gmail.com>
*
* 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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
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.0.99
QZ_VERSION = 2.1.0
unix: VERSION = $$QZ_VERSION
DEFINES *= QUPZILLA_VERSION=\\\"""$$QZ_VERSION"\\\""

Expand Down
9 changes: 7 additions & 2 deletions src/lib/app/profilemanager.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* ============================================================
* QupZilla - WebKit based browser
* Copyright (C) 2010-2016 David Rosca <nowrep@gmail.com>
* QupZilla - Qt web browser
* Copyright (C) 2010-2017 David Rosca <nowrep@gmail.com>
*
* 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
Expand Down Expand Up @@ -197,6 +197,11 @@ void ProfileManager::updateProfile(const QString &current, const QString &profil
return;
}

// No change in 2.1
if (prof < Updater::Version("2.1.99")) {
return;
}

// Nothing for now
}

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.0.2</string>
<string>2.1.0</string>
<key>CFBundleVersion</key>
<string>2.0.2</string>
<string>2.1.0</string>
<key>CFBundleSignature</key>
<string>@TYPEINFO@</string>
<key>CFBundleExecutable</key>
Expand Down
10 changes: 5 additions & 5 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,0,0,2
PRODUCTVERSION 2,0,0,2
FILEVERSION 2,1,0,0
PRODUCTVERSION 2,1,0,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.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"
Expand Down
2 changes: 1 addition & 1 deletion windows/installer.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 4062473

Please sign in to comment.