From 160190dfb3464dc31c9796ac173805ba10bfc5d0 Mon Sep 17 00:00:00 2001
From: David Rosca <nowrep@gmail.com>
Date: Sat, 11 Oct 2014 13:11:49 +0200
Subject: [PATCH] master branch is now 1.9.0 development version

---
 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 +-
 6 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/haiku/QupZilla.rdef b/haiku/QupZilla.rdef
index 14cdca865..de0785bf0 100644
--- a/haiku/QupZilla.rdef
+++ b/haiku/QupZilla.rdef
@@ -2,7 +2,7 @@ resource app_signature "application/x-vnd.QupZilla";
 resource app_flags B_SINGLE_LAUNCH;
 resource app_version {
 	major  = 1,
-	middle = 8,
+	middle = 9,
 	minor  = 0,
 
 	/* Application "variety" can be set to one of the following:
diff --git a/src/defines.pri b/src/defines.pri
index d7df04432..b10564c4e 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.0
+QZ_VERSION = 1.9.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 fbb717d27..4cff0adb9 100644
--- a/src/lib/app/profilemanager.cpp
+++ b/src/lib/app/profilemanager.cpp
@@ -214,6 +214,11 @@ void ProfileManager::updateProfile(const QString &current, const QString &profil
         return;
     }
 
+    if (prof >= Updater::Version("1.8.0") && prof < Updater::Version("1.9.0")) {
+        // do nothing
+        return;
+    }
+
     std::cout << "QupZilla: Incompatible profile version detected (" << qPrintable(profile) << "), overwriting profile data..." << std::endl;
 
     copyDataToProfile();
diff --git a/src/main/Info.plist b/src/main/Info.plist
index 154d14d78..ba9711e37 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.9.0</string>
     <key>CFBundleVersion</key>
-    <string>1.8.1</string>
+    <string>1.9.0</string>
     <key>CFBundleSignature</key>
     <string>@TYPEINFO@</string>
     <key>CFBundleExecutable</key>
diff --git a/src/main/appicon.rc b/src/main/appicon.rc
index be4c3493a..db753a1be 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,0,0
- PRODUCTVERSION 1,8,0,0
+ FILEVERSION 1,9,0,0
+ PRODUCTVERSION 1,9,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", "1.8.0"
+            VALUE "FileVersion", "1.9.0"
             VALUE "LegalCopyright", "Copyright (C) 2010-2014 David Rosca"
             VALUE "InternalName", "qupzilla"
             VALUE "OriginalFilename", "qupzilla.exe"
             VALUE "ProductName", "QupZilla"
-            VALUE "ProductVersion", "1.8.0"
+            VALUE "ProductVersion", "1.9.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/windows/installer.nsi b/windows/installer.nsi
index f573fbf7f..5d8216ce6 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.0"
+!define /date PRODUCT_VERSION "1.9.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"