diff options
| author | axis <qt-info@nokia.com> | 2009-10-30 12:34:46 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-10-30 12:34:46 (GMT) |
| commit | 7a2fbdaaf06e69b1b35c7e5560127ff5cd93f362 (patch) | |
| tree | f158cbf2c32d046e31473b2d70e462c07c43d122 /src/3rdparty | |
| parent | 5e95f9c3c224b87840e750d4280806a40ed40c92 (diff) | |
| parent | da9880eaed0d09338717db1a73db01e6b0ab080d (diff) | |
| download | Qt-7a2fbdaaf06e69b1b35c7e5560127ff5cd93f362.zip Qt-7a2fbdaaf06e69b1b35c7e5560127ff5cd93f362.tar.gz Qt-7a2fbdaaf06e69b1b35c7e5560127ff5cd93f362.tar.bz2 | |
Merge branch '4.6-s60' into 4.6
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/WebCore.pro | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index a835fc7..d633a7a 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -3376,3 +3376,18 @@ CONFIG(QTDIR_build):isEqual(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 4 plugins/win/PaintHooks.asm } } + +# Temporary workaround to pick up the DEF file from the same place as all the others +symbian { + shared { + contains(MMP_RULES, defBlock) { + MMP_RULES -= defBlock + + MMP_RULES += "$${LITERAL_HASH}ifdef WINSCW" \ + "DEFFILE ../../../s60installs/bwins/$${TARGET}.def" \ + "$${LITERAL_HASH}elif defined EABI" \ + "DEFFILE ../../../s60installs/eabi/$${TARGET}.def" \ + "$${LITERAL_HASH}endif" + } + } +} |