From dff03823302e020bdfefbb1023c8297fa31d325d Mon Sep 17 00:00:00 2001
From: Pascal Quantin <pascal.quantin@gmail.com>
Date: Sun, 27 Jul 2014 22:10:23 +0200
Subject: Ensure that QT5_BASE_DIR is known by QtShark.pro

Otherwise the call to winqtdeploy will fail if it is not already in the PATH

Change-Id: I74db604a6fd45204bda8d6ac9d9c98c0c12598ec
Reviewed-on: https://code.wireshark.org/review/3218
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
---
 Makefile.nmake | 1 +
 1 file changed, 1 insertion(+)

(limited to 'Makefile.nmake')

diff --git a/Makefile.nmake b/Makefile.nmake
index add5bcbb5c..4adbcb2527 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -491,6 +491,7 @@ VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO)
 VERSION_FULL = $(VERSION)
 WTAP_VERSION = $(WTAP_VERSION)
 INSTALL_DIR = $(INSTALL_DIR)
+QT5_BASE_DIR = $(QT5_BASE_DIR:\=/)
 !IFDEF MANIFEST_INFO_REQUIRED
 CONFIG += wireshark_manifest_info_required
 !ENDIF
-- 
cgit v1.2.3