diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2011-01-17 14:14:56 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-01-17 14:19:19 (GMT) |
| commit | 500b76e801bf82d1a473641a3746b3d5adab5beb (patch) | |
| tree | 6b6bb14c06540a4d935dce70b935f6f361115f52 /mkspecs/features/mac | |
| parent | 1b6656ea26d2a82a8763e8f3759b0ac683fca57a (diff) | |
| download | Qt-500b76e801bf82d1a473641a3746b3d5adab5beb.zip Qt-500b76e801bf82d1a473641a3746b3d5adab5beb.tar.gz Qt-500b76e801bf82d1a473641a3746b3d5adab5beb.tar.bz2 | |
don't misdetect powermac host systems when determining target arch
Task-number: QTBUG-6150
Merge-request: 2549
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'mkspecs/features/mac')
| -rw-r--r-- | mkspecs/features/mac/default_post.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf index 4999762..273094d 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf @@ -7,7 +7,7 @@ load(default_post) # 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(QMAKE_HOST.arch, ppc)|contains(QMAKE_HOST.arch, "Power Macintosh") { !contains(QT_CONFIG, ppc64):contains(QT_CONFIG, ppc):CONFIG += ppc contains(QT_CONFIG, ppc64):!contains(QT_CONFIG, ppc):CONFIG += ppc64 } else { |