diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-08-14 12:30:01 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-08-14 12:30:01 (GMT) |
| commit | 8d846a525a67f2b0b680ed836601712a5250ce57 (patch) | |
| tree | 34fef9650992717f5d4274d8c578419ac0475698 /mkspecs | |
| parent | 4c31f59d45130eae8f140e6d0177a4b227454187 (diff) | |
| parent | b770651f19741907cd415ea9ad6e087cb32cc948 (diff) | |
| download | Qt-8d846a525a67f2b0b680ed836601712a5250ce57.zip Qt-8d846a525a67f2b0b680ed836601712a5250ce57.tar.gz Qt-8d846a525a67f2b0b680ed836601712a5250ce57.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-backend
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/mac/default_post.prf | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf index ea9e9bd..4999762 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf @@ -1,2 +1,17 @@ load(default_post) !no_objective_c:CONFIG += objective_c + +# Pick a suitable default architecture for qmake-based applications. +# If the Qt package contains one of x86 and x86_64, pick that one. If it +# contains both then use the compiler default. Make a similiar decision for +# PowerPC-based systems. Note that this logic assumes that Qt has been +# configured with an architecture that is usable on the system. +qt:!isEmpty(QT_CONFIG) { + contains(QMAKE_HOST.arch, ppc) { + !contains(QT_CONFIG, ppc64):contains(QT_CONFIG, ppc):CONFIG += ppc + contains(QT_CONFIG, ppc64):!contains(QT_CONFIG, ppc):CONFIG += ppc64 + } else { + !contains(QT_CONFIG, x86_64):contains(QT_CONFIG, x86):CONFIG += x86 + contains(QT_CONFIG, x86_64):!contains(QT_CONFIG, x86):CONFIG += x86_64 + } +} |