diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-09-10 23:03:22 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-09-10 23:03:22 +0000 |
| commit | dc60423e87debcde36e2830eda15a5f53fbfc0e1 (patch) | |
| tree | e6706ae4d041d9d0235e661b535b0f842b0c84e0 /ui/qt/capture_file_dialog.h | |
| parent | b74aa22317e3358f4032cc7e99702baa4d18ac04 (diff) | |
| download | wireshark-dc60423e87debcde36e2830eda15a5f53fbfc0e1.tar.gz | |
Use the native merge dialog on Windows. This may break non-Windows builds.
svn path=/trunk/; revision=44864
Diffstat (limited to 'ui/qt/capture_file_dialog.h')
| -rw-r--r-- | ui/qt/capture_file_dialog.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ui/qt/capture_file_dialog.h b/ui/qt/capture_file_dialog.h index 29c4d33bb9..c2a1205b5f 100644 --- a/ui/qt/capture_file_dialog.h +++ b/ui/qt/capture_file_dialog.h @@ -100,6 +100,8 @@ private: QCheckBox transport_res_; QCheckBox network_res_; QCheckBox external_res_; +#else // Q_WS_WIN + int merge_type_; #endif // Q_WS_WIN signals: |