diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-12-10 16:35:51 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-12-10 16:35:51 +0100 |
| commit | 0aa42ae2de7f072f7ccac46136923091816db4ed (patch) | |
| tree | a2093bad6e5f76c98c924c440f12c949dcd9f9bb /share/qbs/modules/cpp/DarwinGCC.qbs | |
| parent | 64dc0e1872b1d69e5d3303821df49896f8800fa3 (diff) | |
| parent | 62d9a36e64b0e83466c2bdbdd313578d300cd497 (diff) | |
Merge remote-tracking branch 'origin/1.1'
Conflicts:
src/lib/tools/persistence.cpp
Change-Id: Ied3824ae11b927426df51cf92881c1f2cfa3c073
Diffstat (limited to 'share/qbs/modules/cpp/DarwinGCC.qbs')
| -rw-r--r-- | share/qbs/modules/cpp/DarwinGCC.qbs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/share/qbs/modules/cpp/DarwinGCC.qbs b/share/qbs/modules/cpp/DarwinGCC.qbs index bbe4cf5cb..37f72d13a 100644 --- a/share/qbs/modules/cpp/DarwinGCC.qbs +++ b/share/qbs/modules/cpp/DarwinGCC.qbs @@ -70,7 +70,8 @@ UnixGCC { // architectures supported, to support iPhone 3G for example one has to add // armv6 to the list and also compile for it (with Xcode 4.4.1 or earlier) - dict["UIRequiredDeviceCapabilities"] = [ "armv7" ]; + if (!qbs.targetOS.contains("ios-simulator")) + dict["UIRequiredDeviceCapabilities"] = [ "armv7" ]; var orientations = [ "UIInterfaceOrientationPortrait", |