diff options
| author | Shane Kearns <shane.kearns@sosco.com> | 2009-10-28 07:52:30 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-11-11 16:06:51 (GMT) |
| commit | 570e173f4b6dbe755554d36a26ae23ccb6c58693 (patch) | |
| tree | 77ee7fbf4a6835e37b28794031b596b9f8731ac3 /src | |
| parent | 76e4b230e61ca4e557fe2b3eafdad9d2b0a64122 (diff) | |
| download | Qt-570e173f4b6dbe755554d36a26ae23ccb6c58693.zip Qt-570e173f4b6dbe755554d36a26ae23ccb6c58693.tar.gz Qt-570e173f4b6dbe755554d36a26ae23ccb6c58693.tar.bz2 | |
Re-apply change 914d5847532a85a564a5df4a2bc8bdccb0f91abb by Shane Kearns
Re-apply change cadd19cd98b9a6ff7ff8755f7774027400aadb0f by Shane Kearns
Re-apply change 6bc9ef388590b4bfb281d2e1510dc7c3d1837349 by Shane Kearns
Fix to 8e0fbc2caa3edefb78d6667721235b783bc1a850
This version of the fix will set the def file only if defblock is enabled
in qbase.pri. That means that def files don't get turned on for webkit
but not for the whole project (avoids build failures in the continuous
integration system when other teams change the exported symbols)
Reviewed-by: Jason Barron
Diffstat (limited to 'src')
| -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 60e414f..4e84a80 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -3381,3 +3381,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" + } + } +} |