From: Uwe Hermann <redacted>
Date: Wed, 19 Jul 2017 18:55:59 +0000 (+0200)
Subject: Fix the build with ENABLE_DECODE=n.
X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=commitdiff_plain;h=7773ccaeb96ba66891e9072deb69001c9c74ddf7

Fix the build with ENABLE_DECODE=n.

  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]
---

diff --git a/pv/dialogs/settings.cpp b/pv/dialogs/settings.cpp
index ada41183..8ad8e068 100644
--- a/pv/dialogs/settings.cpp
+++ b/pv/dialogs/settings.cpp
@@ -214,6 +214,7 @@ QWidget *Settings::get_decoder_settings_form(QWidget *parent) const
 	return form;
 #else
 	(void)parent;
+	return nullptr;
 #endif
 }