From 72a6bb8fb789d68f881977f0435ede8083c01f7d Mon Sep 17 00:00:00 2001
From: David Rosca <nowrep@gmail.com>
Date: Thu, 9 Oct 2014 10:49:02 +0200
Subject: [PATCH] Version 1.8.2

---
 CHANGELOG             | 8 ++++++++
 README.md             | 2 +-
 haiku/QupZilla.rdef   | 2 +-
 src/defines.pri       | 2 +-
 src/main/Info.plist   | 4 ++--
 src/main/appicon.rc   | 8 ++++----
 windows/installer.nsi | 2 +-
 7 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 2f2891654..8d23f1230 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,11 @@
+Version 1.8.2
+    * released 9 October 2014
+    * updated translations
+    * use bigger default font sizes
+    * fixed: profile version check when updating from 1.8.0
+    * fixed: crash on startup on Mac
+    * fixed: crash when opening menu on Mac when there is no browser window
+
 Version 1.8.1
     * released 5 October 2014
     * reverted setting DNT header by default
diff --git a/README.md b/README.md
index 575309e99..b7513f155 100644
--- a/README.md
+++ b/README.md
@@ -74,7 +74,7 @@ You need to specify path to `macdeployqt` only if it is not in PATH.
 Current version
 ----------------------------------------------------------------------------------------
 
-The current stable version of QupZilla is 1.8.1. You can download precompiled packages
+The current stable version of QupZilla is 1.8.2. 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 6762b1dc5..11f039b3a 100644
--- a/haiku/QupZilla.rdef
+++ b/haiku/QupZilla.rdef
@@ -3,7 +3,7 @@ resource app_flags B_SINGLE_LAUNCH;
 resource app_version {
 	major  = 1,
 	middle = 8,
-	minor  = 1,
+	minor  = 2,
 
 	/* Application "variety" can be set to one of the following:
 	*	B_APPV_DEVELOPMENT,
diff --git a/src/defines.pri b/src/defines.pri
index de21de469..b9cf805c4 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 = 1.8.1
+QZ_VERSION = 1.8.2
 unix: VERSION = $$QZ_VERSION
 DEFINES *= QUPZILLA_VERSION=\\\"""$$QZ_VERSION"\\\""
 
diff --git a/src/main/Info.plist b/src/main/Info.plist
index 154d14d78..eea9e0c7d 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>1.8.1</string>
+    <string>1.8.2</string>
     <key>CFBundleVersion</key>
-    <string>1.8.1</string>
+    <string>1.8.2</string>
     <key>CFBundleSignature</key>
     <string>@TYPEINFO@</string>
     <key>CFBundleExecutable</key>
diff --git a/src/main/appicon.rc b/src/main/appicon.rc
index e7889b391..d90e3725b 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 1,8,1,0
- PRODUCTVERSION 1,8,1,0
+ FILEVERSION 1,8,2,0
+ PRODUCTVERSION 1,8,2,0
  FILEFLAGS 0x0L
  FILEFLAGSMASK 0x3fL
  FILEOS 0x00040004L
@@ -18,12 +18,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "QupZilla Team"
             VALUE "FileDescription", "QupZilla Web Browser"
-            VALUE "FileVersion", "1.8.1"
+            VALUE "FileVersion", "1.8.2"
             VALUE "LegalCopyright", "Copyright (C) 2010-2014 David Rosca"
             VALUE "InternalName", "qupzilla"
             VALUE "OriginalFilename", "qupzilla.exe"
             VALUE "ProductName", "QupZilla"
-            VALUE "ProductVersion", "1.8.1"
+            VALUE "ProductVersion", "1.8.2"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/windows/installer.nsi b/windows/installer.nsi
index 9acaf8c3e..ea2f8a8f9 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 "1.8.1"
+!define /date PRODUCT_VERSION "1.8.2"
 !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"