summaryrefslogtreecommitdiff
path: root/src/3rdparty
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@digia.com>2013-06-07 10:10:17 +0200
committerAlex <alexander.blasche@digia.com>2013-06-07 10:39:49 +0200
commit9590ffd0ec7f3e45af52fe12e911bca762637f9b (patch)
tree1d741e7e16c768aca7ac217ef40db732f137188f /src/3rdparty
parentd61bb39b8b865b36539ae8843b2e3c6b8fe85457 (diff)
downloadqtlocation-9590ffd0ec7f3e45af52fe12e911bca762637f9b.tar.gz
Fix the build on Mac when c++11 was enabled
Task-number: QTBUG-31445 Change-Id: Iac7771f06f4a8f784c7330e299fe0bc448e45202 Reviewed-by: Alex <alexander.blasche@digia.com>
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/poly2tri/poly2tri.pro3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/3rdparty/poly2tri/poly2tri.pro b/src/3rdparty/poly2tri/poly2tri.pro
index 779eae63..981f375d 100644
--- a/src/3rdparty/poly2tri/poly2tri.pro
+++ b/src/3rdparty/poly2tri/poly2tri.pro
@@ -7,6 +7,9 @@ CONFIG -= qt
contains(QT_CONFIG, debug_and_release):CONFIG += debug_and_release
contains(QT_CONFIG, build_all):CONFIG += build_all
+# workaround for QTBUG-31586
+contains(QT_CONFIG, c++11): CONFIG += c++11
+
*-g++* {
QMAKE_CXXFLAGS += -O3 -ftree-vectorize -ffast-math -funsafe-math-optimizations -Wno-error=return-type
}