From 1a4456c233b73ab08f7003b0196a30ae408b5c86 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Mon, 29 May 2017 13:46:30 +0200 Subject: Make "bin" the libexec path on Windows Otherwise, our binary distributions will not work out of the box, as the process launcher is not in the same place as the libraries. Change-Id: Ied375fa48e5c2cb037d3cb2108296126ee3be4cc Reviewed-by: Joerg Bornemann --- src/app/qbs/qbs.pro | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/app') diff --git a/src/app/qbs/qbs.pro b/src/app/qbs/qbs.pro index f2c3023b6..ac9d6f0ca 100644 --- a/src/app/qbs/qbs.pro +++ b/src/app/qbs/qbs.pro @@ -20,7 +20,10 @@ HEADERS += \ qbstool.h include(../../library_dirname.pri) -isEmpty(QBS_RELATIVE_LIBEXEC_PATH):QBS_RELATIVE_LIBEXEC_PATH=../libexec/qbs +isEmpty(QBS_RELATIVE_LIBEXEC_PATH) { + win32:QBS_RELATIVE_LIBEXEC_PATH=. + else:QBS_RELATIVE_LIBEXEC_PATH=../libexec/qbs +} isEmpty(QBS_RELATIVE_PLUGINS_PATH):QBS_RELATIVE_PLUGINS_PATH=../$${QBS_LIBRARY_DIRNAME} isEmpty(QBS_RELATIVE_SEARCH_PATH):QBS_RELATIVE_SEARCH_PATH=.. DEFINES += QBS_RELATIVE_LIBEXEC_PATH=\\\"$${QBS_RELATIVE_LIBEXEC_PATH}\\\" -- cgit v1.2.1