diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-06-20 13:38:11 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-20 18:27:44 +0200 |
| commit | 25ccef35eb19fd656eba2a7abe5419972ed28552 (patch) | |
| tree | e0c92532c3c70135d0a547675414e95d21a66822 /src/core/gyp_run.pro | |
| parent | 3398abfc1b5b789d11592aada0b5860e36a50041 (diff) | |
| parent | e91f09947b55dda8a13b2aeb0963836dee2ece8d (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
src/3rdparty
src/core/permission_manager_qt.cpp
src/core/renderer/web_channel_ipc_transport.cpp
src/core/renderer/web_channel_ipc_transport.h
Change-Id: I25fd8ed7c433dadce44d8ac1e39f86e211ec25f0
Diffstat (limited to 'src/core/gyp_run.pro')
| -rw-r--r-- | src/core/gyp_run.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro index 35b85b4c7..a1b33e258 100644 --- a/src/core/gyp_run.pro +++ b/src/core/gyp_run.pro @@ -34,7 +34,7 @@ force_debug_info { # Copy this logic from qt_module.prf so that ninja can run according # 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 } |