diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-10-30 12:39:17 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-10-30 12:39:17 (GMT) |
| commit | e95e69f7d1209cceacdef0f26416b93c1d83e8e0 (patch) | |
| tree | 34f0de65b226f115c3f9119a8386461f2d60176a /src/3rdparty | |
| parent | 6edbe2ba4fd231d2fb9de25b861b3e25160ed8ca (diff) | |
| parent | 7a2fbdaaf06e69b1b35c7e5560127ff5cd93f362 (diff) | |
| download | Qt-e95e69f7d1209cceacdef0f26416b93c1d83e8e0.zip Qt-e95e69f7d1209cceacdef0f26416b93c1d83e8e0.tar.gz Qt-e95e69f7d1209cceacdef0f26416b93c1d83e8e0.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into origin-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" + } + } +} |