diff options
| author | Morten Sorvig <msorvig@trolltech.com> | 2009-08-13 12:37:39 +0200 |
|---|---|---|
| committer | Morten Sorvig <msorvig@trolltech.com> | 2009-09-11 11:02:13 +0200 |
| commit | c03d1a9e12c9b9766c1e652985aeeab23be352a8 (patch) | |
| tree | 5cd2e02265d98d46747fe330923bd8efb7367033 /mkspecs | |
| parent | 8ee8f3383c05c0e82d81304f60b97ca7659074cc (diff) | |
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.
Reviewed-by: Marius Storm-Olsen
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/mac/default_post.prf | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf index ea9e9bd60a..210a704463 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf @@ -1,2 +1,18 @@ 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. +message(hei $$QT_CONFIG ) +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 + } +} |