diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-09-17 23:40:53 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-09-17 23:40:53 +0000 |
| commit | 3069f22bd1b84b56225e959a6e2ccbb09c53bdbe (patch) | |
| tree | e418e2d77571601bd6ae0d685793095b3a41f82c /ui/qt/QtShark.pro | |
| parent | 06499e6dd0043609acff788fffba8eb9d6f744d9 (diff) | |
| download | wireshark-3069f22bd1b84b56225e959a6e2ccbb09c53bdbe.tar.gz | |
Add a text import dialog. Use libui.
svn path=/trunk/; revision=44956
Diffstat (limited to 'ui/qt/QtShark.pro')
| -rw-r--r-- | ui/qt/QtShark.pro | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/ui/qt/QtShark.pro b/ui/qt/QtShark.pro index a9b8a6c959..8e58514e75 100644 --- a/ui/qt/QtShark.pro +++ b/ui/qt/QtShark.pro @@ -134,9 +134,6 @@ win32:INCLUDEPATH += \ # We have to manually trigger relinking each time one of these is modified. # Is there any way to do this automatically? SOURCES_WS_C = \ - ../alert_box.c \ - ../iface_lists.c \ - ../util.c \ ../../airpcap_loader.c \ ../../capture-pcap-util.c \ ../../capture.c \ @@ -239,7 +236,8 @@ HEADERS_QT_CPP = \ wireshark_application.h FORMS += main_window.ui \ - main_welcome.ui + main_welcome.ui \ + import_text_dialog.ui win32 { ## These should be in config.pri ?? !isEmpty(PORTAUDIO_DIR) { @@ -285,7 +283,7 @@ macx:QMAKE_LFLAGS += \ -framework CoreServices \ -framework ApplicationServices -framework CoreFoundation -framework CoreServices -unix:LIBS += -L../../lib -Wl,-rpath ../../lib -lwireshark -lwiretap -lwsutil \ +unix:LIBS += -L../../lib -Wl,-rpath ../../lib -lwireshark -lwiretap -lwsutil -lui \ -lpcap macx:LIBS += -Wl,-macosx_version_min,10.5 -liconv @@ -318,6 +316,7 @@ win32 { LIBS += \ wsock32.lib user32.lib shell32.lib comctl32.lib comdlg32.lib \ -L../../epan -llibwireshark -L../../wsutil -llibwsutil -L../../wiretap -lwiretap-$${WTAP_VERSION} \ + -L.. -llibui \ -L$${GLIB_DIR}/lib -lglib-2.0 -lgmodule-2.0 !isEmpty(MSVCR_DLL) { @@ -366,7 +365,6 @@ win32 { #QMAKE_POST_LINK +=$$quote(cd $$replace(PLUGINS_IN_PWD, /, \\)\\..\\..\\plugins$$escape_expand(\\n\\t)) #QMAKE_POST_LINK +=$$quote(nmake -f Makefile.nmake INSTALL_DIR=$$replace(PLUGINS_OUT_PWD, /, \\)\\$(DESTDIR)$$escape_expand(\\n\\t)) #QMAKE_POST_LINK +=$$quote(cd $$replace(PLUGINS_IN_PWD, /, \\)$$escape_expand(\\n\\t)) - } RESOURCES += \ @@ -385,3 +383,9 @@ ICON = ../../packaging/macosx/Resources/Wireshark.icns RC_FILE = qtshark.rc win32: QMAKE_CLEAN += *.pdb + +HEADERS += \ + import_text_dialog.h + +SOURCES += \ + import_text_dialog.cpp |