[Qt] Run windeployqt for Qt versions greater than 5.2
authorAndersBroman <a.broman@bredband.net>
Sun, 18 Jan 2015 15:38:35 +0000 (16:38 +0100)
committerAnders Broman <a.broman58@gmail.com>
Sun, 18 Jan 2015 22:49:59 +0000 (22:49 +0000)
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>
ui/qt/Wireshark.pro

index 9c25b1033b05432cf5d6f6007413ade05bdc2ac0..b169212c29a0d82ba125aa80ce48837b9edf0c2a 100644 (file)
@@ -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))
     }