diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | 2010-10-19 14:23:35 (GMT) |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | 2010-10-20 17:40:11 (GMT) |
| commit | 1d4bf2d8a4c44f7d91dcde95b54cdd85e4b9b665 (patch) | |
| tree | 852b1a4ab294d6d8a8de5fa5353592074c78a765 /src/qbase.pri | |
| parent | 28acb60009e0c40116da4897d21bcb47ef9663ee (diff) | |
| download | Qt-1d4bf2d8a4c44f7d91dcde95b54cdd85e4b9b665.zip Qt-1d4bf2d8a4c44f7d91dcde95b54cdd85e4b9b665.tar.gz Qt-1d4bf2d8a4c44f7d91dcde95b54cdd85e4b9b665.tar.bz2 | |
Handle Objective-C/C++ sources in SOURCES gracefully
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>
Diffstat (limited to 'src/qbase.pri')
| -rw-r--r-- | src/qbase.pri | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/qbase.pri b/src/qbase.pri index 30f3337..933b91e 100644 --- a/src/qbase.pri +++ b/src/qbase.pri @@ -8,7 +8,6 @@ isEmpty(QT_MAJOR_VERSION) { } else { VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION} } -mac:!contains(QMAKE_EXT_C, .mm):QMAKE_EXT_C += .mm #load up the headers info CONFIG += qt_install_headers |