diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-05-23 18:07:22 +0200 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-06-10 06:36:52 +0000 |
| commit | e005e99005d83e89ef2499320306c46a14965e7a (patch) | |
| tree | 926718b7c283edf85985d031c026ba6d2488c6b9 /mkspecs/features/qt_helper_lib.prf | |
| parent | 196d55ba5c8d169d120f17ca1db3d85ea1e5b4dd (diff) | |
fix ios device&simulator builds again
the assumption stated in b67a0836d is actually invalid - configure sets
build_all without debug_and_release there. debug_and_release does
actually imply build_all, though.
to make things less confusing, don't let configure inject
iphonesimulator_and_iphoneos into all projects, but handle it like
debug_and_release instead.
Change-Id: Ib7acdc63308a538862fc603428f81aba60bca08e
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'mkspecs/features/qt_helper_lib.prf')
| -rw-r--r-- | mkspecs/features/qt_helper_lib.prf | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mkspecs/features/qt_helper_lib.prf b/mkspecs/features/qt_helper_lib.prf index 3393154436..8e61316aa6 100644 --- a/mkspecs/features/qt_helper_lib.prf +++ b/mkspecs/features/qt_helper_lib.prf @@ -18,7 +18,9 @@ QT = # In case qt is re-added. CONFIG -= warning_clean # Don't presume 3rd party code to be clean load(qt_common) -contains(QT_CONFIG, debug_and_release): CONFIG += debug_and_release build_all +contains(QT_CONFIG, simulator_and_device): CONFIG += iphonesimulator_and_iphoneos +contains(QT_CONFIG, debug_and_release): CONFIG += debug_and_release +contains(QT_CONFIG, build_all): CONFIG += build_all DESTDIR = $$MODULE_BASE_OUTDIR/lib DLLDESTDIR = $$MODULE_BASE_OUTDIR/bin |