diff options
| author | Iain <qt-info@nokia.com> | 2009-10-09 18:21:15 (GMT) |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@nokia.com> | 2009-10-22 18:34:23 (GMT) |
| commit | f4abf627a8d097e095022d2709718a681b54bd7e (patch) | |
| tree | da889d1fa820f0da4f9b706a5c044822ae54890b | |
| parent | 6125aabeccb01a07c706fe4227279eb827e8e890 (diff) | |
| download | Qt-f4abf627a8d097e095022d2709718a681b54bd7e.zip Qt-f4abf627a8d097e095022d2709718a681b54bd7e.tar.gz Qt-f4abf627a8d097e095022d2709718a681b54bd7e.tar.bz2 | |
Re-apply change 8e0fbc2caa3edefb78d6667721235b783bc1a850 by Iain
Temporary workaround to get WebKit to pick up DEF file from std location
Tweak WebCore .pro file to get its DEF file from the same location as
all the other DEF files come from
Reviewed-by: TrustMe
| -rw-r--r-- | src/3rdparty/webkit/WebCore/WebCore.pro | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index a835fc7..f321aad 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -87,6 +87,19 @@ win32-g++ { QMAKE_LIBDIR_POST += $$split(TMPPATH,";") } +# Temporary workaround to pick up the DEF file from the same place as all the others +symbian { + shared { + 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" + } +} + # Assume that symbian OS always comes with sqlite symbian:!CONFIG(QTDIR_build): CONFIG += system-sqlite |