diff options
| author | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2012-08-14 00:43:10 +0000 |
|---|---|---|
| committer | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2012-08-14 00:43:10 +0000 |
| commit | 1eaf3ffce43ce1dee1e17a3ce11ec882953fda5a (patch) | |
| tree | d5496637d87034aa8d5de71442f95113a22f6736 /ui/qt | |
| parent | 67129d2ae070da7ccf11564e70392fde2132c026 (diff) | |
Don't copy over the entire contents of the GnuTLS bin directory. Move
wireshark-qt to the top source directory alongside wireshark-gtk2. We
may want to merge them at some point.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@44482 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'ui/qt')
| -rw-r--r-- | ui/qt/QtShark.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/qt/QtShark.pro b/ui/qt/QtShark.pro index 815c88be4f..9cc596b96b 100644 --- a/ui/qt/QtShark.pro +++ b/ui/qt/QtShark.pro @@ -116,7 +116,7 @@ win32 { error("Can't find config.pri. Have you run 'nmake -f Makefile.nmake' two directories up?") } - DESTDIR = wireshark-qt + DESTDIR = ../../wireshark-qt !wireshark_manifest_info_required { CONFIG -= embed_manifest_dll @@ -326,7 +326,7 @@ win32 { $${GLIB_DIR}/bin/libgthread-2.0-0.dll $${GLIB_DIR}/bin/$${INTL_DLL} \ $${C_ARES_DIR}/bin/libcares-2.dll $${ZLIB_DIR}/zlib1.dll \ $${GNUTLS_DIR}/bin/libgcrypt-11.dll $${GNUTLS_DIR}/bin/libgnutls-26.dll \ - $${GNUTLS_DIR}/bin/libgpg-error-0.dll $${GNUTLS_DIR}/bin/ $${GNUTLS_DIR}/bin/libtasn1-3.dll \ + $${GNUTLS_DIR}/bin/libgpg-error-0.dll $${GNUTLS_DIR}/bin/libtasn1-3.dll \ $${GNUTLS_DIR}/bin/libintl-8.dll $${SMI_DIR}/bin/libsmi-2.dll \ $${LUA_DIR}/lua5.1.dll \ $${GEOIP_DIR}/bin/libGeoIP-1.dll \ |