From 83fb860a034ee946bac3d50b225f90cebe0cba4a Mon Sep 17 00:00:00 2001 From: maxkadushkin Date: Mon, 3 Feb 2020 15:17:43 +0300 Subject: [PATCH] [win-nix] correct path for binary (#83) --- win-linux/extras/projicons/ProjIcons.pro | 1 + win-linux/extras/projicons/common.pri | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/win-linux/extras/projicons/ProjIcons.pro b/win-linux/extras/projicons/ProjIcons.pro index d9c14c7fa..d4f64e636 100644 --- a/win-linux/extras/projicons/ProjIcons.pro +++ b/win-linux/extras/projicons/ProjIcons.pro @@ -1,4 +1,5 @@ +DESTDIR = $$PWD include(common.pri) DEFINES += APP_ICON_PATH=\"./res/desktopeditors.ico\" diff --git a/win-linux/extras/projicons/common.pri b/win-linux/extras/projicons/common.pri index 79360b015..8cb21f75c 100644 --- a/win-linux/extras/projicons/common.pri +++ b/win-linux/extras/projicons/common.pri @@ -31,8 +31,8 @@ contains(QMAKE_TARGET.arch, x86_64):{ QMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:WINDOWS,5.01 } -core_release:DESTDIR = $$PWD/build -core_debug:DESTDIR = $$PWD/build/debug +core_release:DESTDIR = $$DESTDIR/build +core_debug:DESTDIR = $$DESTDIR/build/debug !isEmpty(OO_BUILD_BRANDING) { DESTDIR = $$DESTDIR/$$OO_BUILD_BRANDING