Release 2.3.4

- Show all URL schemes in entry view [#1768]
- Disable merge when database is locked [#1975]
- Fix intermittent crashes with favorite icon downloads [#1980]
- Provide potential crash warning to Qt 5.5.x users [#2211]
- Disable apply button when creating new entry/group to prevent data loss [#2204]
- Allow for 12 hour timeout to lock idle database [#2173]
- Multiple SSH Agent fixes [#1981, #2117]
- Multiple Browser Integration enhancements [#1993, #2003, #2055, #2116, #2159, #2174, #2185]
- Fix browser proxy application not closing properly [#2142]
- Add real names and Patreon supporters to about dialog [#2214]
- Add settings button to toolbar, Donate button, and Report a Bug button to help menu [#2214]
- Enhancements to release-tool to appsign intermediate build products [#2101]

.gitignore

@@ -10,4 +10,5 @@ release*/
 *.swp
 
 .DS_Store
-.version
+.version
+\.scannerwork/

CHANGELOG

@@ -1,3 +1,20 @@
+2.3.4 (2018-08-21)
+=========================
+
+- Show all URL schemes in entry view [#1768]
+- Disable merge when database is locked [#1975]
+- Fix intermittent crashes with favorite icon downloads [#1980]
+- Provide potential crash warning to Qt 5.5.x users [#2211]
+- Disable apply button when creating new entry/group to prevent data loss [#2204]
+- Allow for 12 hour timeout to lock idle database [#2173]
+- Multiple SSH Agent fixes [#1981, #2117]
+- Multiple Browser Integration enhancements [#1993, #2003, #2055, #2116, #2159, #2174, #2185]
+- Fix browser proxy application not closing properly [#2142]
+- Add real names and Patreon supporters to about dialog [#2214]
+- Add settings button to toolbar, Donate button, and Report a Bug button to help menu [#2214]
+- Enhancements to release-tool to appsign intermediate build products [#2101]
+
+
 2.3.3 (2018-05-09)
 =========================
 

CMakeLists.txt

@@ -70,7 +70,7 @@ set(CMAKE_AUTOUIC ON)
 
 set(KEEPASSXC_VERSION_MAJOR "2")
 set(KEEPASSXC_VERSION_MINOR "3")
-set(KEEPASSXC_VERSION_PATCH "3")
+set(KEEPASSXC_VERSION_PATCH "4")
 set(KEEPASSXC_VERSION "${KEEPASSXC_VERSION_MAJOR}.${KEEPASSXC_VERSION_MINOR}.${KEEPASSXC_VERSION_PATCH}")
 
 set(KEEPASSXC_BUILD_TYPE "Snapshot" CACHE STRING "Set KeePassXC build type to distinguish between stable releases and snapshots")

INSTALL.md

@@ -38,6 +38,7 @@ Prepare the Building Environment
 
 Build Steps
 ===========
+We recommend using the release tool to perform builds, please read up-to-date instructions [on our wiki](https://github.com/keepassxreboot/keepassxc/wiki/Building-KeePassXC#building-using-the-release-tool).
 
 To compile from source, open a **Terminal (on Linux/MacOS)** or a **MSYS2-MinGW shell (on Windows)**<br/>
 **Note:** on Windows make sure you are using a **MINGW shell** by checking the label before the current path
@@ -68,6 +69,9 @@ cd build
 cmake -DWITH_TESTS=OFF ...and other options - see below...
 make
 ```
+
+If you are on Windows, you may have to add ```-G "MSYS Makefiles"``` to the beginning of the cmake command. See the [Windows Build Instructions](https://github.com/keepassxreboot/keepassxc/wiki/Building-KeePassXC#windows) for more information.
+
 These steps place the compiled KeePassXC binary inside the `./build/src/` directory.
 (Note the cmake notes/options below.)
 

ci/snapcraft/Dockerfile

@@ -0,0 +1,51 @@
+# KeePassXC Linux Release Build Dockerfile
+# Copyright (C) 2017-2018 KeePassXC team <https://keepassxc.org/>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 or (at your option)
+# version 3 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+FROM snapcore/snapcraft
+
+ENV REBUILD_COUNTER=1
+
+ENV QT5_VERSION=510
+ENV QT5_PPA_VERSION=5.10.1
+
+RUN set -x \
+    && apt update -y \
+    && apt -y install software-properties-common
+
+RUN set -x \
+    && add-apt-repository ppa:phoerious/keepassxc
+
+RUN set -x \
+    && apt update -y \
+    && apt-get -y --no-install-recommends install \
+      build-essential \
+      cmake \
+      libgcrypt20-18-dev \
+      libargon2-0-dev \
+      libsodium-dev \
+      qtbase5-dev \
+      qttools5-dev \
+      qttools5-dev-tools \
+      zlib1g-dev \
+      libyubikey-dev \
+      libykpers-1-dev \
+      libxi-dev \
+      libxtst-dev \
+      xvfb
+
+RUN set -x \
+    && apt-get autoremove --purge
+

cmake/CodeCoverage.cmake

@@ -131,6 +131,10 @@ FUNCTION(SETUP_TARGET_FOR_COVERAGE _targetname _testrunner _outputname)
 	ENDIF() # NOT GENHTML_PATH
 
 	SET(coverage_info "${CMAKE_BINARY_DIR}/${_outputname}.info")
+	IF(MINGW)
+		# Replace C:/ with /C for MINGW
+		STRING(REGEX REPLACE "^([a-zA-Z]):" "/\\1" coverage_info ${coverage_info})
+	ENDIF()
 	SET(coverage_cleaned "${coverage_info}.cleaned")
 
 	SEPARATE_ARGUMENTS(test_command UNIX_COMMAND "${_testrunner}")