Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
dd660316
Commit
dd660316
authored
Mar 31, 2016
by
Don Gagne
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3122 from DonLakeFlyer/NewClang
Update for new Clang errors
parents
55eeb588
8188f645
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
3 deletions
+7
-3
QGCCommon.pri
QGCCommon.pri
+4
-0
QGCFileDialog.h
src/QGCFileDialog.h
+1
-1
QGCDataPlot2D.cc
src/ui/QGCDataPlot2D.cc
+2
-2
No files found.
QGCCommon.pri
View file @
dd660316
...
...
@@ -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 {
...
...
src/QGCFileDialog.h
View file @
dd660316
...
...
@@ -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
Q
GC
FileDialog
::
exec
();
}
int
exec
(
void
)
{
return
QFileDialog
::
exec
();
}
private:
static
void
_validate
(
Options
&
options
);
...
...
src/ui/QGCDataPlot2D.cc
View file @
dd660316
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment