diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-07-20 15:40:35 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-07-20 22:42:34 +0000 |
| commit | 8e4ae943b257280def01ee8fb4670d2a70370a59 (patch) | |
| tree | 78577aa117004293c6cc55b8bbe3f5559ef1afd6 /ui | |
| parent | 127a9bde00346eaba5ff9126d721cdbac17de5a6 (diff) | |
show_timer_ isn't used on OS X with Qt < 5.0.0.
Change-Id: I5b7a73dcc3bb0f11d24b6d1e9e9d2bcd1f333278
Reviewed-on: https://code.wireshark.org/review/9728
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/qt/progress_frame.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ui/qt/progress_frame.cpp b/ui/qt/progress_frame.cpp index 21374016fa..adf879df3a 100644 --- a/ui/qt/progress_frame.cpp +++ b/ui/qt/progress_frame.cpp @@ -194,7 +194,9 @@ void ProgressFrame::timerEvent(QTimerEvent *event) void ProgressFrame::hide() { +#if !defined(Q_OS_MAC) || QT_VERSION > QT_VERSION_CHECK(5, 0, 0) show_timer_ = -1; +#endif QFrame::hide(); #ifdef QWINTASKBARPROGRESS_H if (taskbar_progress_) { |