From 4ff781fa4846c7e1d9d90230dac9bc2f14369fa4 Mon Sep 17 00:00:00 2001
From: Jonathan White <support@dmapps.us>
Date: Tue, 10 Mar 2020 21:59:43 -0400
Subject: [PATCH] Version Bump and Deployment Fixes

* Use KeePassXC executable icon for the start menu shortcut on Windows to prevent the icon from being deleted on installation of a new version. Fixes #4226

* Support improvements to windeployqt in Qt 5.14.1+
---
 CHANGELOG.md                                    | 2 +-
 CMakeLists.txt                                  | 4 ++--
 share/linux/org.keepassxc.KeePassXC.appdata.xml | 5 +++++
 share/windows/wix-template.xml                  | 1 -
 snap/snapcraft.yaml                             | 2 +-
 src/CMakeLists.txt                              | 8 +++++---
 6 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68ec8f1f6..76bb5c38b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## 2.6 (unreleased)
+## 2.6.0 (unreleased)
 
 ### Added
 - Added CLI db-info command [#4231]
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8b41f3924..f1f5c328a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -99,8 +99,8 @@ if(NOT WITH_XC_NETWORKING AND WITH_XC_UPDATECHECK)
 endif()
 
 set(KEEPASSXC_VERSION_MAJOR "2")
-set(KEEPASSXC_VERSION_MINOR "5")
-set(KEEPASSXC_VERSION_PATCH "3")
+set(KEEPASSXC_VERSION_MINOR "6")
+set(KEEPASSXC_VERSION_PATCH "0")
 set(KEEPASSXC_VERSION "${KEEPASSXC_VERSION_MAJOR}.${KEEPASSXC_VERSION_MINOR}.${KEEPASSXC_VERSION_PATCH}")
 set(OVERRIDE_VERSION "" CACHE STRING "Override the KeePassXC Version for Snapshot builds")
 
diff --git a/share/linux/org.keepassxc.KeePassXC.appdata.xml b/share/linux/org.keepassxc.KeePassXC.appdata.xml
index f670ebce9..cb8d53cb1 100644
--- a/share/linux/org.keepassxc.KeePassXC.appdata.xml
+++ b/share/linux/org.keepassxc.KeePassXC.appdata.xml
@@ -50,6 +50,11 @@
     </screenshots>
 
     <releases>
+        <release version="2.6.0" date="2020-04-01">
+            <description>
+            <ul><li>TBD</li></ul>
+            </description>
+        </release>
         <release version="2.5.3" date="2020-01-19">
             <description>
                 <ul>
diff --git a/share/windows/wix-template.xml b/share/windows/wix-template.xml
index 9693d6344..3f808723a 100644
--- a/share/windows/wix-template.xml
+++ b/share/windows/wix-template.xml
@@ -64,7 +64,6 @@
                 <Shortcut Id="ApplicationStartMenuShortcut" 
                     Name="KeePassXC"
                     Target="[#CM_FP_KeePassXC.exe]"
-                    Icon="ProductIcon.ico"
                     WorkingDirectory="INSTALL_ROOT"/>
                 <RemoveFolder Id="ApplicationProgramsFolder" On="uninstall"/>
                 <RegistryValue Root="HKCU" Key="Software\KeePassXC" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index d30349ae6..c03e302bf 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: keepassxc
-version: 2.5.3
+version: 2.6.0
 grade: stable
 summary: Community-driven port of the Windows application “KeePass Password Safe”
 description: |
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5214242b2..327f088be 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -465,9 +465,11 @@ if(MINGW)
             COMPONENT Runtime)
 
     # Use windeployqt.exe to setup Qt dependencies
-    set(WINDEPLOYQT_MODE "--release")
-    if(CMAKE_BUILD_TYPE_LOWER STREQUAL "debug")
-        set(WINDEPLOYQT_MODE "--debug")
+    if(Qt5Core_VERSION VERSION_LESS "5.14.1")
+        set(WINDEPLOYQT_MODE "--release")
+        if(CMAKE_BUILD_TYPE_LOWER STREQUAL "debug")
+            set(WINDEPLOYQT_MODE "--debug")
+        endif()
     endif()
 
     install(CODE "execute_process(COMMAND ${WINDEPLOYQT_EXE} ${PROGNAME}.exe ${WINDEPLOYQT_MODE} WORKING_DIRECTORY \${CMAKE_INSTALL_PREFIX} OUTPUT_QUIET)"