projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a2b2b65
)
Fix the build with ENABLE_DECODE=n.
author
Uwe Hermann
<uwe@hermann-uwe.de>
Wed, 19 Jul 2017 18:55:59 +0000
(20:55 +0200)
committer
Uwe Hermann
<uwe@hermann-uwe.de>
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
patch
|
blob
|
history
diff --git
a/pv/dialogs/settings.cpp
b/pv/dialogs/settings.cpp
index ada41183becb816d47aeb973ea0697cfae4b8ba1..8ad8e068e933061ccbe2e0202194cb84fe2d0095 100644
(file)
--- 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
}