From b3d76635b17d96f7be780ce2849ab3e8e0618635 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 24 Jun 2015 00:59:58 +0200 Subject: [PATCH] added version, checking for TARGET_PREFIX variable --- general.pri | 12 +++++++++++- passwordfile.pro | 1 + 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/general.pri b/general.pri index 9156999..9f790b4 100644 --- a/general.pri +++ b/general.pri @@ -12,7 +12,17 @@ unix { QMAKE_LFLAGS += "-Wl,--rpath=./" } # prefix -targetprefix = . +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 diff --git a/passwordfile.pro b/passwordfile.pro index 418be3f..637459e 100644 --- a/passwordfile.pro +++ b/passwordfile.pro @@ -1,4 +1,5 @@ projectname = passwordfile +VERSION = 2.0.5 # include ../../common.pri when building as part of a subdirs project; otherwise include general.pri !include(../../common.pri) {