diff options
| author | Jonathan Liu <net147@gmail.com> | 2012-10-27 20:46:11 +1100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-29 14:31:23 +0100 |
| commit | 8e6b5b089cc303521a4c72901f2f613ae1eff90b (patch) | |
| tree | da73d67fb4daa2c5cf88ad624ea3ad41e955fe3c /src/3rdparty | |
| parent | fd330db9e5631438f86e0fae52aea5454519d196 (diff) | |
| download | qtlocation-8e6b5b089cc303521a4c72901f2f613ae1eff90b.tar.gz | |
Make poly2tri library build both debug and release versions
Since the poly2tri library doesn't load qt_module.prf, build_all doesn't
get added to CONFIG automatically. This resulted in only the debug
version of the library getting built when Qt was configured for building
both debug and release.
Fixed by making sure build_all and debug_and_release are added to
CONFIG explicitly in affected libraries if they are present in
QT_CONFIG.
Task-number: QTBUG-27679
Change-Id: I62172fc311383ab11c9a71fb65ccfcd163268b82
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/poly2tri/poly2tri.pro | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/3rdparty/poly2tri/poly2tri.pro b/src/3rdparty/poly2tri/poly2tri.pro index 04fd7b34..9d4e1b1e 100644 --- a/src/3rdparty/poly2tri/poly2tri.pro +++ b/src/3rdparty/poly2tri/poly2tri.pro @@ -4,6 +4,9 @@ TARGET = poly2tri CONFIG += staticlib CONFIG -= qt +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 } |