From 522c241f166db6c1e2b7b30644e9a8911e79f706 Mon Sep 17 00:00:00 2001
From: David Rosca <nowrep@gmail.com>
Date: Sun, 8 Oct 2017 16:05:56 +0200
Subject: [PATCH] Version 2.2.0

---
 CHANGELOG                      | 11 +++++++++++
 README.md                      |  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 +-
 7 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index d781071be..261802021 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,14 @@
+Version 2.2.0
+    * released 08 October 2017
+    * added back print element background option
+    * added back print preview dialog
+    * added session manager
+    * tab icon is now hidden when page has no icon
+    * improved locationbar completer with search suggestions
+    * improved handling of downloading dependencies in GreaseMonkey scripts
+    * various improvements in TabManager extension
+    * Linux: PulseAudio streams now have QupZilla app name and icon
+
 Version 2.1.2
     * released 15 March 2017
     * updated translations
diff --git a/README.md b/README.md
index e9046fa2c..17b2b0ae3 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.1.2. You can download precompiled packages
+The current stable version of QupZilla is 2.2.0. 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/src/defines.pri b/src/defines.pri
index 5a05ca239..7e5c67c71 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.1.99
+QZ_VERSION = 2.2.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 54bcf44f4..516cdb685 100644
--- a/src/lib/app/profilemanager.cpp
+++ b/src/lib/app/profilemanager.cpp
@@ -202,6 +202,11 @@ void ProfileManager::updateProfile(const QString &current, const QString &profil
         return;
     }
 
+    // No change in 2.2
+    if (prof < Updater::Version("2.2.99")) {
+        return;
+    }
+
     // Nothing for now
 }
 
diff --git a/src/main/Info.plist b/src/main/Info.plist
index e75d29a14..e83dc0f2c 100644
--- a/src/main/Info.plist
+++ b/src/main/Info.plist
@@ -7,9 +7,9 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleGetInfoString</key>
-    <string>2.1.2</string>
+    <string>2.2.0</string>
     <key>CFBundleVersion</key>
-    <string>2.1.2</string>
+    <string>2.2.0</string>
     <key>CFBundleSignature</key>
     <string>@TYPEINFO@</string>
     <key>CFBundleExecutable</key>
diff --git a/src/main/appicon.rc b/src/main/appicon.rc
index 154dbcb12..c945a6b63 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,1,2,0
- PRODUCTVERSION 2,1,2,0
+ FILEVERSION 2,2,0,0
+ PRODUCTVERSION 2,2,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.1.2"
+            VALUE "FileVersion", "2.2.0"
             VALUE "LegalCopyright", "Copyright (C) 2010-2017 David Rosca"
             VALUE "InternalName", "qupzilla"
             VALUE "OriginalFilename", "qupzilla.exe"
             VALUE "ProductName", "QupZilla"
-            VALUE "ProductVersion", "2.1.2"
+            VALUE "ProductVersion", "2.2.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/windows/installer.nsi b/windows/installer.nsi
index 6d4461996..b9dc9dc1f 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.1.2
+  !define VERSION 2.2.0
   !define ARCH x86
   !define MSVC_VER 140
   !define OPENSSL_BIN_DIR .