summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/mac
Commit message (Collapse)AuthorAgeFilesLines
* Objective-c prf may not override OBJECTIVE_CFLAGS settings.con2011-03-101-9/+0
| | | | Reviewed-by: Morten Johan Sørvig
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-251-1/+1
|\ | | | | | | | | | | Conflicts: configure src/network/bearer/bearer.pri
| * don't misdetect powermac host systems when determining target archKonstantin Tokarev2011-01-171-1/+1
| | | | | | | | | | | | Task-number: QTBUG-6150 Merge-request: 2549 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Handle Objective-C/C++ sources in SOURCES gracefullyTor Arne Vestbø2010-10-201-8/+17
|/ | | | | | | | | | We look though SOURCES for Objective-C/C++ source files and if we find any we warn the user and move the offending file to OBJECTIVE_SOURCES. We also don't generate implicit rules for .mm files anymore, since that's not supported by qmake and will break in mysterious ways. Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Fix compiler flags setting for .mm files on Mac.Morten Sorvig2009-08-171-2/+1
| | | | | | Commit 7f1cba82 causes {x86, x86_64, ppc, ppc64}.prf to be loaded before objective_c.prf. This will add content to QMAKE_OBJECTIVE_CFLAGS, causing the isEmpty test to skip populating QMAKE_OBJECTIVE_CFLAGS. Remove the isEmpty test to fix the issue.
* Remove yet another forgotten debug message.Morten Sorvig2009-08-131-1/+0
|
* Pick a suitable default architecture for qmake-based applications.Morten Sorvig2009-08-131-0/+16
| | | | | | | | | 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
* Long live Qt!Lars Knoll2009-03-2310-0/+87