From c57973615837c3d0c1a8574a204d3a1943bd1e48 Mon Sep 17 00:00:00 2001
From: Janek Bevendorff <janek@jbev.net>
Date: Wed, 20 Dec 2017 00:19:04 +0100
Subject: [PATCH] Bundle qtbase translations on Windows

---
 share/translations/CMakeLists.txt | 6 ++++++
 src/CMakeLists.txt                | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/share/translations/CMakeLists.txt b/share/translations/CMakeLists.txt
index 7380750e4..a5d8882be 100644
--- a/share/translations/CMakeLists.txt
+++ b/share/translations/CMakeLists.txt
@@ -1,3 +1,4 @@
+#  Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
 #  Copyright (C) 2014 Felix Geyer <debfx@fobos.de>
 #
 #  This program is free software: you can redistribute it and/or modify
@@ -21,6 +22,11 @@ message(STATUS "${TRANSLATION_FILES}")
 
 qt5_add_translation(QM_FILES ${TRANSLATION_FILES})
 
+if(MINGW)
+    file(GLOB QTBASE_TRANSLATIONS ${Qt5_DIR}/../../../share/qt5/translations/qtbase_*.qm)
+endif()
+set(QM_FILES ${QM_FILES} ${QTBASE_TRANSLATIONS})
+
 install(FILES ${QM_FILES} DESTINATION ${DATA_INSTALL_DIR}/translations)
 add_custom_target(translations DEPENDS ${QM_FILES})
 add_dependencies(${PROGNAME} translations)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 42e1bdbd0..afa30056c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,5 @@
-#  Copyright (C) 2010 Felix Geyer <debfx@fobos.de>
 #  Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
+#  Copyright (C) 2010 Felix Geyer <debfx@fobos.de>
 #
 #  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
@@ -352,7 +352,7 @@ if(MINGW)
   include(DeployQt4)
   install_qt4_executable(${PROGNAME}.exe)
   add_custom_command(TARGET ${PROGNAME} POST_BUILD
-                     COMMAND ${CMAKE_COMMAND} -E copy_if_different ${Qt5Core_DIR}/../../../share/qt5/plugins/platforms/qwindows$<$<CONFIG:Debug>:d>.dll
+                     COMMAND ${CMAKE_COMMAND} -E copy_if_different ${Qt5_DIR}/../../../share/qt5/plugins/platforms/qwindows$<$<CONFIG:Debug>:d>.dll
                      $<TARGET_FILE_DIR:${PROGNAME}>)
   install(FILES $<TARGET_FILE_DIR:${PROGNAME}>/qwindows$<$<CONFIG:Debug>:d>.dll DESTINATION "platforms")
 endif()