diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-07 11:06:28 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 11:06:28 +0200 |
| commit | f55629245259ba7364e258f92408823024423caa (patch) | |
| tree | f73063cf02dc175fbe9f0bfb48b3ddd686ea0f72 /src/3rdparty/clip2tri/clip2tri.pro | |
| parent | 22d980c8124026eb712f563326d5a5c1b180c671 (diff) | |
| parent | d89701c5c8646dedb0ebb2e011c4da796a6ae8a1 (diff) | |
| download | qtlocation-f55629245259ba7364e258f92408823024423caa.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
src/plugins/geoservices/geoservices.pro
Change-Id: Ie82dd22c588e5cba409fc1ef31a65968ce9f719b
Diffstat (limited to 'src/3rdparty/clip2tri/clip2tri.pro')
| -rw-r--r-- | src/3rdparty/clip2tri/clip2tri.pro | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/3rdparty/clip2tri/clip2tri.pro b/src/3rdparty/clip2tri/clip2tri.pro index 4ae7a799..802c0409 100644 --- a/src/3rdparty/clip2tri/clip2tri.pro +++ b/src/3rdparty/clip2tri/clip2tri.pro @@ -1,6 +1,6 @@ TARGET = clip2tri -CONFIG += staticlib exceptions +CONFIG += staticlib exceptions warn_off optimize_full INCLUDEPATH += ../poly2tri INCLUDEPATH += ../clipper @@ -10,8 +10,9 @@ load(qt_helper_lib) # 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 +gcc { + QMAKE_CFLAGS_OPTIMIZE_FULL += -ffast-math + !clang:!intel_icc:!rim_qcc: QMAKE_CXXFLAGS_WARN_ON += -Wno-error=return-type } HEADERS += clip2tri.h |