diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-31 11:33:19 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-31 11:33:53 +0200 |
| commit | d2d5d24f86f12a2d1b0a6bc46c0d48306d7d2130 (patch) | |
| tree | d67555a6c699c49a89ea10863b6c0e4c0c3f5cae /src/core/api | |
| parent | f9e951d0946fe0fcd51e9015108f92c46ecc8138 (diff) | |
| parent | 42d864c86d8c85db7b2d42f8505d962a642e4c77 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I561c00b3a844ab493a5bf0148a5923662842cf5d
Diffstat (limited to 'src/core/api')
| -rw-r--r-- | src/core/api/core_api.pro | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/core/api/core_api.pro b/src/core/api/core_api.pro index 19b67876c..a9f5adaba 100644 --- a/src/core/api/core_api.pro +++ b/src/core/api/core_api.pro @@ -15,6 +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, debug_and_release):CONFIG += debug_and_release contains(QT_CONFIG, build_all):CONFIG += build_all } |