aboutsummaryrefslogtreecommitdiffstats
path: root/ui/qt
diff options
context:
space:
mode:
authorgerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>2012-08-14 18:16:57 +0000
committergerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>2012-08-14 18:16:57 +0000
commite61659287e0d641d7d4db49c50f67eff517a5d70 (patch)
treefc66b170c5dffed6d0e12daf74ba874aa07c8a20 /ui/qt
parentfd64ac611fd33f5a438c96c9ff014abb7de1e312 (diff)
Copy the QtCore and QtGui DLLs to the Qt staging directory.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@44497 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'ui/qt')
-rw-r--r--ui/qt/QtShark.pro10
1 files changed, 10 insertions, 0 deletions
diff --git a/ui/qt/QtShark.pro b/ui/qt/QtShark.pro
index 9cc596b96b..3388751528 100644
--- a/ui/qt/QtShark.pro
+++ b/ui/qt/QtShark.pro
@@ -319,6 +319,16 @@ win32 {
-L../../epan -llibwireshark -L../../wsutil -llibwsutil -L../../wiretap -lwiretap-$${WTAP_VERSION} \
-L$${GLIB_DIR}/lib -lglib-2.0 -lgmodule-2.0
+ CONFIG(debug, debug|release) {
+ EXTRA_BINFILES += \
+ $$QMAKE_LIBDIR_QT/QtCored4.dll \
+ $$QMAKE_LIBDIR_QT/QtGuid4.dll
+ } else:CONFIG(release, debug|release) {
+ EXTRA_BINFILES += \
+ $$QMAKE_LIBDIR_QT/QtCore4.dll \
+ $$QMAKE_LIBDIR_QT/QtGui4.dll
+ }
+
EXTRA_BINFILES += \
../../dumpcap.exe \
../../epan/libwireshark.dll ../../wiretap/wiretap-$${WTAP_VERSION}.dll ../../wsutil/libwsutil.dll \