From aa7ab1d9e1c92fe11a48e01074c8eab6588da5ac Mon Sep 17 00:00:00 2001
From: nowrep <nowrep@gmail.com>
Date: Sat, 7 Jan 2012 12:43:18 +0100
Subject: [PATCH] Version 1.1.5

---
 README.md                             | 2 +-
 src/app/profileupdater.cpp            | 6 +++++-
 src/app/qupzilla.cpp                  | 2 +-
 src/appicon.rc                        | 8 ++++----
 src/opensearch/searchenginesmanager.h | 3 ++-
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 5d2c074b6..73a646d99 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@ To install QupZilla, you will have to run this command: (it may be neccessary to
 Current version
 ----------------------------------------------------------------------------------------
 
-The current released version of QupZilla is 1.1.0. You can download precompiled packages
+The current released version of QupZilla is 1.1.5. You can download precompiled packages
 and the sources from the download section.
 However, if you want the latest revision, just take the latest code snapshot either by
 downloading a tarball or running:
diff --git a/src/app/profileupdater.cpp b/src/app/profileupdater.cpp
index 290c73f90..59564c747 100644
--- a/src/app/profileupdater.cpp
+++ b/src/app/profileupdater.cpp
@@ -80,8 +80,12 @@ void ProfileUpdater::updateProfile(const QString &current, const QString &profil
         return;
     }
 
+    if (profileVersion == Updater::parseVersionFromString("1.1.0")) {
+        // Do nothing, nothing changed
+        return;
+    }
 
-    std::cout << "incompatible profile version detected, updating profile data..." << std::endl;
+    std::cout << "incompatible profile version detected, overwriting profile data..." << std::endl;
 
     copyDataToProfile();
 }
diff --git a/src/app/qupzilla.cpp b/src/app/qupzilla.cpp
index 785e5eb27..09539c195 100644
--- a/src/app/qupzilla.cpp
+++ b/src/app/qupzilla.cpp
@@ -62,7 +62,7 @@
 #include "webhistorywrapper.h"
 #include "enhancedmenu.h"
 
-const QString QupZilla::VERSION = "1.1.0";
+const QString QupZilla::VERSION = "1.1.5";
 const QString QupZilla::BUILDTIME =  __DATE__" "__TIME__;
 const QString QupZilla::AUTHOR = "David Rosca";
 const QString QupZilla::COPYRIGHT = "2010-2012";
diff --git a/src/appicon.rc b/src/appicon.rc
index ac3987c3b..085240736 100644
--- a/src/appicon.rc
+++ b/src/appicon.rc
@@ -4,8 +4,8 @@ IDI_ICON1 ICON DISCARDABLE "data\icons\exeicons\qupzilla.ico"
 IDI_ICON2 ICON DISCARDABLE "data\icons\exeicons\page.ico"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,1,0,0
- PRODUCTVERSION 1,1,0,0
+ FILEVERSION 1,1,5,0
+ PRODUCTVERSION 1,1,5,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.1.0"
+            VALUE "FileVersion", "1.1.5"
             VALUE "LegalCopyright", "Copyright (C) 2010-2012 David Rosca"
             VALUE "InternalName", "qupzilla"
             VALUE "OriginalFilename", "qupzilla.exe"
             VALUE "ProductName", "QupZilla"
-            VALUE "ProductVersion", "1.1.0"
+            VALUE "ProductVersion", "1.1.5"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/opensearch/searchenginesmanager.h b/src/opensearch/searchenginesmanager.h
index 5bc2af785..7e196e677 100644
--- a/src/opensearch/searchenginesmanager.h
+++ b/src/opensearch/searchenginesmanager.h
@@ -48,7 +48,8 @@ public:
 
         bool operator==(const Engine &other) const {
             return (this->name == other.name &&
-                    this->url == other.url);
+                    this->url == other.url &&
+                    this->suggestionsUrl == other.suggestionsUrl);
         }
     };