diff options
author | Joerg Mayer <jmayer@loplof.de> | 2021-11-21 22:05:36 +0100 |
---|---|---|
committer | Jörg Mayer <jmghc@loplof.de> | 2021-11-24 10:31:16 +0000 |
commit | fe01f0109d890ba673772cbfcc1ec101120f98c6 (patch) | |
tree | 33e7b937cb6d7ec508b90f109444f62b9152eb52 /ui/qt/rtp_player_dialog.cpp | |
parent | 24a364f762eabef63eb026a09e8c3a886ea5d051 (diff) |
Readd feature to make QtXMultimedia optional again
In order to be able to defer solving all Qt6 API differences at once
I tried to reactivate the QT_MULTIMEDIA_LIB feature. I managed to fix
most problems but one problem remains in both Qt5 and Qt6 builds.
Without Qt[56]Multimedia, the following error exceeds my non-existing
C++ knowledge:
jmayer/work/wireshark/git/ui/qt/rtp_player_dialog.cpp:154:18: error: out-of-line definition of 'RtpPlayerDialog' does not match any declaration in 'RtpPlayerDialog'
RtpPlayerDialog::RtpPlayerDialog(QWidget &parent, CaptureFile &cf, bool capture_running) :
^~~~~~~~~~~~~~~
Diffstat (limited to 'ui/qt/rtp_player_dialog.cpp')
-rw-r--r-- | ui/qt/rtp_player_dialog.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ui/qt/rtp_player_dialog.cpp b/ui/qt/rtp_player_dialog.cpp index d4dec83638..7372b789aa 100644 --- a/ui/qt/rtp_player_dialog.cpp +++ b/ui/qt/rtp_player_dialog.cpp @@ -134,6 +134,7 @@ public: }; +#ifdef QT_MULTIMEDIA_LIB RtpPlayerDialog *RtpPlayerDialog::pinstance_{nullptr}; std::mutex RtpPlayerDialog::mutex_; @@ -148,6 +149,7 @@ RtpPlayerDialog *RtpPlayerDialog::openRtpPlayerDialog(QWidget &parent, CaptureFi } return pinstance_; } +#endif // QT_MULTIMEDIA_LIB RtpPlayerDialog::RtpPlayerDialog(QWidget &parent, CaptureFile &cf, bool capture_running) : WiresharkDialog(parent, cf) @@ -158,7 +160,6 @@ RtpPlayerDialog::RtpPlayerDialog(QWidget &parent, CaptureFile &cf, bool capture_ , first_stream_rel_stop_time_(0.0) , streams_length_(0.0) , start_marker_time_(0.0) -#endif // QT_MULTIMEDIA_LIB , number_ticker_(new QCPAxisTicker) , datetime_ticker_(new QCPAxisTickerDateTime) , stereo_available_(false) @@ -170,6 +171,7 @@ RtpPlayerDialog::RtpPlayerDialog(QWidget &parent, CaptureFile &cf, bool capture_ , lock_ui_(0) , read_capture_enabled_(capture_running) , silence_skipped_time_(0.0) +#endif // QT_MULTIMEDIA_LIB { ui->setupUi(this); loadGeometry(parent.width(), parent.height()); |