]> sigrok.org Git - pulseview.git/commitdiff
Fix the build with ENABLE_DECODE=n.
authorUwe Hermann <redacted>
Wed, 19 Jul 2017 18:55:59 +0000 (20:55 +0200)
committerUwe Hermann <redacted>
Fri, 21 Jul 2017 13:05:00 +0000 (15:05 +0200)
  pv/dialogs/settings.cpp: In member function ‘QWidget* pv::dialogs::Settings::get_decoder_settings_form(QWidget*) const’:
  pv/dialogs/settings.cpp:218:1: error: no return statement in function returning non-void [-Werror=return-type]

pv/dialogs/settings.cpp

index ada41183becb816d47aeb973ea0697cfae4b8ba1..8ad8e068e933061ccbe2e0202194cb84fe2d0095 100644 (file)
@@ -214,6 +214,7 @@ QWidget *Settings::get_decoder_settings_form(QWidget *parent) const
        return form;
 #else
        (void)parent;
        return form;
 #else
        (void)parent;
+       return nullptr;
 #endif
 }
 
 #endif
 }