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/3rdparty/webkit | |
| 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/3rdparty/webkit')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/WebCore.pro | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index 981dba2..63bde2f 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -2180,11 +2180,11 @@ contains(DEFINES, ENABLE_NETSCAPE_PLUGIN_API=1) { mac { SOURCES += \ - plugins/mac/PluginPackageMac.cpp \ - plugins/mac/PluginViewMac.mm + plugins/mac/PluginPackageMac.cpp OBJECTIVE_SOURCES += \ platform/text/mac/StringImplMac.mm \ - platform/mac/WebCoreNSStringExtras.mm + platform/mac/WebCoreNSStringExtras.mm \ + plugins/mac/PluginViewMac.mm INCLUDEPATH += platform/mac # Note: XP_MACOSX is defined in npapi.h } else { |