diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-06-17 11:27:24 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-06-17 12:22:23 +0000 |
| commit | 42623ee69c62372afad8c11135f44bb4f6bc0cfd (patch) | |
| tree | 564ca782d03f41b7c7d88f0de941ef31bd34a4c1 /src/core/api | |
| parent | 807adfeec9f9dadb651e401b7dd69eeccda4dd7a (diff) | |
fix logical mismerge from 5.6
iphonesimulator_and_iphoneos was renamed to simulator_and_device in 5.7.
Change-Id: I0be78eb67b9f9867548108235eb180874f66cb95
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/api')
| -rw-r--r-- | src/core/api/core_api.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/api/core_api.pro b/src/core/api/core_api.pro index a9f5adaba..6e2d606b2 100644 --- a/src/core/api/core_api.pro +++ b/src/core/api/core_api.pro @@ -15,7 +15,7 @@ CONFIG -= create_prl # Copy this logic from qt_module.prf so that the intermediate library can be # created to the same rules as the final module linking in core_module.pro. !host_build:if(win32|mac):!macx-xcode { - contains(QT_CONFIG, simulator_and_device): CONFIG += iphonesimulator_and_iphoneos + contains(QT_CONFIG, simulator_and_device): CONFIG += simulator_and_device contains(QT_CONFIG, debug_and_release):CONFIG += debug_and_release contains(QT_CONFIG, build_all):CONFIG += build_all } |