diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2014-07-27 22:10:23 +0200 |
|---|---|---|
| committer | Graham Bloice <graham.bloice@trihedral.com> | 2014-07-29 13:36:52 +0000 |
| commit | dff03823302e020bdfefbb1023c8297fa31d325d (patch) | |
| tree | 4fa962b52aecf3c4d0e21bcbd2aed3003d3c63ce /Makefile.nmake | |
| parent | 3b11d2215bb5ff6f4a2bb0cc3b3722360061c6c6 (diff) | |
| download | wireshark-dff03823302e020bdfefbb1023c8297fa31d325d.tar.gz wireshark-dff03823302e020bdfefbb1023c8297fa31d325d.tar.bz2 wireshark-dff03823302e020bdfefbb1023c8297fa31d325d.zip | |
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>
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 1 |
1 files changed, 1 insertions, 0 deletions
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 |