mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2024-11-29 07:24:13 +01:00
Merged in skarlsso/librepilot/skarlsso/LP-251_incorrect_null_check (pull request #191)
Skarlsso/lp 251_incorrect_null_check
This commit is contained in:
commit
0f25a510f5
@ -605,7 +605,7 @@ bool UAVObjectGeneratorGCS::generate(UAVObjectParser *parser, QString templatepa
|
||||
*/
|
||||
bool UAVObjectGeneratorGCS::process_object(ObjectInfo *object)
|
||||
{
|
||||
if (info == NULL) {
|
||||
if (object == NULL) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -6,7 +6,12 @@
|
||||
QT += xml
|
||||
QT -= gui
|
||||
macx {
|
||||
QMAKE_CXXFLAGS += -fpermissive
|
||||
CONFIG += warn_on
|
||||
!warn_off {
|
||||
QMAKE_CXXFLAGS_WARN_ON += -Werror
|
||||
QMAKE_CFLAGS_WARN_ON += -Werror
|
||||
QMAKE_CXXFLAGS += -fpermissive
|
||||
}
|
||||
}
|
||||
# use ccache when available
|
||||
QMAKE_CC = $$(CCACHE) $$QMAKE_CC
|
||||
|
Loading…
Reference in New Issue
Block a user