summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRainer Keller <rainer.keller@digia.com>2013-01-15 14:17:02 +0100
committerAlex <ablasche@gmail.com>2013-01-16 12:14:47 +0100
commit87b2e3a9686948f691b054a39cb6c5d4a4696157 (patch)
tree6a8aa40e64dd71cbd9cb5379f67cdd593bf3e394
parent35d8f0f458cbe5461ed6b1bb27d044638d952b0f (diff)
downloadqtlocation-87b2e3a9686948f691b054a39cb6c5d4a4696157.tar.gz
Ensure compilation does not fail if function does not return a value
In some cases the 3rd party project source tree "poly2tri" does contain an "assert(0)" instead of a return statement. This lets at least the GNU compiler assume a return value is missing. Some systems consider this an error. To prevent compile errors on those this change adds an additional compiler flag to make functions without a valid return value a warning instead of an error. Change-Id: I13acda8bfd274e37195d49392f4f93990f57ded2 Reviewed-by: Alex <ablasche@gmail.com>
-rw-r--r--src/3rdparty/poly2tri/poly2tri.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/poly2tri/poly2tri.pro b/src/3rdparty/poly2tri/poly2tri.pro
index 9d4e1b1e..779eae63 100644
--- a/src/3rdparty/poly2tri/poly2tri.pro
+++ b/src/3rdparty/poly2tri/poly2tri.pro
@@ -8,7 +8,7 @@ contains(QT_CONFIG, debug_and_release):CONFIG += debug_and_release
contains(QT_CONFIG, build_all):CONFIG += build_all
*-g++* {
- QMAKE_CXXFLAGS += -O3 -ftree-vectorize -ffast-math -funsafe-math-optimizations
+ QMAKE_CXXFLAGS += -O3 -ftree-vectorize -ffast-math -funsafe-math-optimizations -Wno-error=return-type
}
SOURCES += common/shapes.cpp \