diff options
author | Evan Huus <eapache@gmail.com> | 2012-09-27 02:43:09 +0000 |
---|---|---|
committer | Evan Huus <eapache@gmail.com> | 2012-09-27 02:43:09 +0000 |
commit | 2a29fee996bc41c3111d74f9902c4d1a831d2c0c (patch) | |
tree | d911a66b4fa34f9d9cc230f7ad0f575070c44e7c /ui/qt/capture_file_dialog.h | |
parent | 3994ddc3574b68e2bb75807b13833508cbf3c943 (diff) |
Only define a parameter name if we end up using it, to fix the
qtshark build on GCC.
svn path=/trunk/; revision=45164
Diffstat (limited to 'ui/qt/capture_file_dialog.h')
-rw-r--r-- | ui/qt/capture_file_dialog.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ui/qt/capture_file_dialog.h b/ui/qt/capture_file_dialog.h index 12f19d9479..7f9db56b31 100644 --- a/ui/qt/capture_file_dialog.h +++ b/ui/qt/capture_file_dialog.h @@ -62,7 +62,11 @@ class CaptureFileDialog : public QFileDialog Q_OBJECT public: explicit CaptureFileDialog(QWidget *parent = NULL, QString &display_filter = *new QString()); - static check_savability_t checkSaveAsWithComments(QWidget *parent, capture_file *cf, int file_type); + static check_savability_t checkSaveAsWithComments(QWidget * +#if defined(Q_WS_WIN) + parent +#endif + , capture_file *cf, int file_type); int mergeType(); int selectedFileType(); |