From 2dbf66c1bbc226ac77c6119f5347ba3cbcc2f492 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 24 Jun 2015 01:02:27 +0200
Subject: [PATCH] added version, improved release of translations, added
 creation of program icon on windows (needs still to be tested)

---
 passwordmanager.pro      | 5 ++---
 resources/windowsicon.rc | 2 +-
 translations.pri         | 9 +++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/passwordmanager.pro b/passwordmanager.pro
index 16516de..2aec2fa 100644
--- a/passwordmanager.pro
+++ b/passwordmanager.pro
@@ -1,4 +1,5 @@
 projectname = passwordmanager
+VERSION = 2.0.7
 
 # include ../../common.pri when building as part of a subdirs project; otherwise include general.pri
 !include(../../common.pri) {
@@ -79,6 +80,7 @@ guiqtquick {
                    translations/passwordmanager_de_DE.ts
 }
 include(translations.pri)
+#win32:include(windowsicon.pri) TODO
 
 OTHER_FILES += \
     README.md \
@@ -111,6 +113,3 @@ INSTALLS += icon
 menu.path = $$(INSTALL_ROOT)/share/applications/
 menu.files = $${PWD}/resources/desktop/applications/$${projectname}.desktop
 INSTALLS += menu
-translations.path = $$(INSTALL_ROOT)/share/$${projectname}/translations/
-translations.files = $${OUT_PWD}/translations/*.qm
-INSTALLS += translations
diff --git a/resources/windowsicon.rc b/resources/windowsicon.rc
index c97460f..433f4bf 100644
--- a/resources/windowsicon.rc
+++ b/resources/windowsicon.rc
@@ -1 +1 @@
-IDI_ICON1 ICON DISCARDABLE "PasswordManager\resources\icon.ico"
\ No newline at end of file
+IDI_ICON1 ICON DISCARDABLE "resources/icons/windowsicon_passwordmanager.ico"
diff --git a/translations.pri b/translations.pri
index d19ca01..f126169 100644
--- a/translations.pri
+++ b/translations.pri
@@ -1,15 +1,16 @@
 !isEmpty(TRANSLATIONS) {
     isEmpty(QMAKE_LRELEASE) {
-        win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe
-        else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
+        QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
     }
     isEmpty(TS_DIR):TS_DIR = translations
-    genqm.name = $$QMAKE_LRELEASE ${QMAKE_FILE_IN} -qm $${OUT_PWD}/$$TS_DIR/${QMAKE_FILE_BASE}.qm
+    genqm.name = translations
     genqm.input = TRANSLATIONS
     genqm.output = $${OUT_PWD}/$$TS_DIR/${QMAKE_FILE_BASE}.qm
     genqm.commands = $$QMAKE_LRELEASE ${QMAKE_FILE_IN} -qm $${OUT_PWD}/$$TS_DIR/${QMAKE_FILE_BASE}.qm
     genqm.CONFIG = no_link
     QMAKE_EXTRA_COMPILERS += genqm
     PRE_TARGETDEPS += compiler_genqm_make_all
-    message("Project contains translations. Use updateqm to compile translations.")
+    translations.path = $$(INSTALL_ROOT)/share/$${projectname}/translations/
+    translations.files = $${OUT_PWD}/translations/*.qm
+    INSTALLS += translations
 }