diff options
| author | AndersBroman <a.broman@bredband.net> | 2015-01-18 16:38:35 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-01-18 22:49:59 +0000 |
| commit | ae92cd48a97a52a3510181422cd9b569056ebb53 (patch) | |
| tree | 90b21730a20bfb96be12cbc5f2c32ae28f3c613a /ui | |
| parent | 59702234b9bb5fed0ee62294613db8780af5a5a0 (diff) | |
[Qt] Run windeployqt for Qt versions greater than 5.2
Change-Id: I3c7e7ed35ffead280c1ac394a4ef8172a89fe3a6
Reviewed-on: https://code.wireshark.org/review/6622
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/qt/Wireshark.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/qt/Wireshark.pro b/ui/qt/Wireshark.pro index 9c25b1033b..b169212c29 100644 --- a/ui/qt/Wireshark.pro +++ b/ui/qt/Wireshark.pro @@ -490,7 +490,7 @@ win32 { # Use windeployqt to copy the required QT libs. # Currently the QT bin dir has to be on the path for windeployqt to work - isEqual(QT_MAJOR_VERSION, 5):isEqual(QT_MINOR_VERSION, 3) { + isEqual(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 2) { QMAKE_POST_LINK +=$$quote(set PATH=%PATH%;$${QT5_BASE_DIR}\\bin$$escape_expand(\\n\\t)) QMAKE_POST_LINK +=$$quote(windeployqt --release --no-compiler-runtime $(DESTDIR)wireshark.exe)$$escape_expand(\\n\\t)) } |