Skip to content

Commit

Permalink
fix compile warnings
Browse files Browse the repository at this point in the history
Signed-off-by: Kai <[email protected]>
  • Loading branch information
flyingk committed Apr 1, 2016
1 parent 2a58733 commit f4ec810
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
4 changes: 4 additions & 0 deletions QGCCommon.pri
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,10 @@ MacBuild | LinuxBuild {
WarningsAsErrorsOn {
QMAKE_CXXFLAGS_WARN_ON += -Werror
}
MacBuild {
# Latest clang version has a buggy check for this which cause Qt headers to throw warnings on qmap.h
QMAKE_CXXFLAGS_WARN_ON += -Wno-return-stack-address
}
}

WindowsBuild {
Expand Down
2 changes: 1 addition & 1 deletion src/QGCFileDialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ class QGCFileDialog : public QFileDialog {
private slots:
/// @brief The exec slot is private because we only want QGCFileDialog users to use the static methods. Otherwise it will break
/// unit testing.
int exec(void) { return QGCFileDialog::exec(); }
int exec(void) { return QFileDialog::exec(); }

private:
static void _validate(Options& options);
Expand Down
4 changes: 2 additions & 2 deletions src/ui/QGCDataPlot2D.cc
Original file line number Diff line number Diff line change
Expand Up @@ -639,8 +639,8 @@ bool QGCDataPlot2D::calculateRegression(QString xName, QString yName, QString me
function = tr("Regression method %1 not found").arg(method);
}

delete x;
delete y;
delete[] x;
delete[] y;
} else {
// xName == yName
function = tr("Please select different X and Y dimensions, not %1 = %2").arg(xName, yName);
Expand Down

0 comments on commit f4ec810

Please sign in to comment.