From 82e21f7285ee86cfdfa2328e927551b64900f7f8 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 17 Jul 2015 23:56:38 +0200
Subject: [PATCH] improved project config

---
 general.pri     | 22 +++++++++++++---------
 qtutilities.pro | 17 +++++++++++++----
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/general.pri b/general.pri
index 9f790b4..81b63cd 100644
--- a/general.pri
+++ b/general.pri
@@ -13,21 +13,14 @@ unix {
 }
 # prefix
 targetprefix = $$(TARGET_PREFIX)
-equals(targetprefix, "") {
-    win32 {
-        targetprefix = ../../..
-    } else {
-        targetprefix = ../..
-    }
-}
 message("Using target prefix \"$${targetprefix}\".")
 # print install root
 message("Using install root \"$$(INSTALL_ROOT)\".")
 # target
 CONFIG(debug, debug|release) {
-    TARGET = $$targetprefix/$${projectname}d
+    TARGET = $${targetprefix}$${projectname}d
 } else {
-    TARGET = $$targetprefix/$$projectname
+    TARGET = $${targetprefix}$${projectname}
 }
 # variables to check target architecture
 win32-g++:QMAKE_TARGET.arch = $$QMAKE_HOST.arch
@@ -79,3 +72,14 @@ guiqtwidgets {
     DEFINES += GUI_QTWIDGETS
     DEFINES += MODEL_UNDO_SUPPORT
 }
+# configuration for cross compliation with mingw-w64
+mingw-w64-manualstrip-dll {
+    QMAKE_POST_LINK=$${CROSS_COMPILE}strip --strip-unneeded ./release/$(TARGET); \
+        $${CROSS_COMPILE}strip --strip-unneeded ./release/lib$(TARGET).a
+}
+mingw-w64-manualstrip-exe {
+    QMAKE_POST_LINK=$${CROSS_COMPILE}strip --strip-unneeded ./release/$(TARGET)
+}
+mingw-w64-noversion {
+    VERSION = ""
+}
diff --git a/qtutilities.pro b/qtutilities.pro
index ebf90b0..2f4356c 100644
--- a/qtutilities.pro
+++ b/qtutilities.pro
@@ -27,7 +27,7 @@ contains(DEFINES, PLATFORM_SPECIFIC_CAPSLOCK_DETECTION) {
 }
 
 SOURCES += resources/resources.cpp \
-        models/checklistmodel.cpp \
+    models/checklistmodel.cpp \
     resources/qtconfigarguments.cpp \
     misc/dialogutils.cpp
 
@@ -87,9 +87,18 @@ INCLUDEPATH += ../
 RESOURCES += resources/qtutilsicons.qrc
 
 # installs
-target.path = $$(INSTALL_ROOT)/lib
-INSTALLS += target
-for(dir, $$list(aboutdialog enterpassworddialog models resources settingsdialog widgets)) {
+mingw-w64-install {
+    target.path = $$(INSTALL_ROOT)
+    target.extra = install -m755 -D $${OUT_PWD}/release/lib$(TARGET).a $$(INSTALL_ROOT)/lib/lib$(TARGET).a
+    INSTALLS += target
+    dlltarget.path = $$(INSTALL_ROOT)
+    dlltarget.extra = install -m755 -D $${OUT_PWD}/release/$(TARGET) $$(INSTALL_ROOT)/bin/$(TARGET)
+    INSTALLS += dlltarget
+} else {
+    target.path = $$(INSTALL_ROOT)/lib
+    INSTALLS += target
+}
+for(dir, $$list(aboutdialog enterpassworddialog models resources settingsdialog widgets misc)) {
     eval(inc_$${dir} = $${dir})
     inc_$${dir}.path = $$(INSTALL_ROOT)/include/$$projectname/$${dir}
     inc_$${dir}.files = $${dir}/*.h