Commit dd660316 authored by Don Gagne's avatar Don Gagne

Merge pull request #3122 from DonLakeFlyer/NewClang

Update for new Clang errors
parents 55eeb588 8188f645
......@@ -167,6 +167,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 {
......
......@@ -134,7 +134,7 @@ public:
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);
......
......@@ -644,8 +644,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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment